From c9042fc3eeb0f4e76f5cc1716677aec39e1821b7 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sun, 8 Sep 2019 10:57:45 +0200
Subject: Rename 'rpath-link secondary' unit test

---
 run_unittests.py                                         |  2 +-
 test cases/unit/63 rpath-link secondary/app/app.c        |  4 ----
 test cases/unit/63 rpath-link secondary/app/meson.build  |  5 -----
 test cases/unit/63 rpath-link secondary/libA/liba.c      |  1 -
 test cases/unit/63 rpath-link secondary/libA/liba.h      |  1 -
 test cases/unit/63 rpath-link secondary/libA/meson.build | 14 --------------
 test cases/unit/63 rpath-link secondary/libB/libb.c      |  3 ---
 test cases/unit/63 rpath-link secondary/libB/libb.h      |  1 -
 test cases/unit/63 rpath-link secondary/libB/meson.build | 16 ----------------
 test cases/unit/67 rpath-link secondary/app/app.c        |  4 ++++
 test cases/unit/67 rpath-link secondary/app/meson.build  |  5 +++++
 test cases/unit/67 rpath-link secondary/libA/liba.c      |  1 +
 test cases/unit/67 rpath-link secondary/libA/liba.h      |  1 +
 test cases/unit/67 rpath-link secondary/libA/meson.build | 14 ++++++++++++++
 test cases/unit/67 rpath-link secondary/libB/libb.c      |  3 +++
 test cases/unit/67 rpath-link secondary/libB/libb.h      |  1 +
 test cases/unit/67 rpath-link secondary/libB/meson.build | 16 ++++++++++++++++
 17 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 test cases/unit/63 rpath-link secondary/app/app.c
 delete mode 100644 test cases/unit/63 rpath-link secondary/app/meson.build
 delete mode 100644 test cases/unit/63 rpath-link secondary/libA/liba.c
 delete mode 100644 test cases/unit/63 rpath-link secondary/libA/liba.h
 delete mode 100644 test cases/unit/63 rpath-link secondary/libA/meson.build
 delete mode 100644 test cases/unit/63 rpath-link secondary/libB/libb.c
 delete mode 100644 test cases/unit/63 rpath-link secondary/libB/libb.h
 delete mode 100644 test cases/unit/63 rpath-link secondary/libB/meson.build
 create mode 100644 test cases/unit/67 rpath-link secondary/app/app.c
 create mode 100644 test cases/unit/67 rpath-link secondary/app/meson.build
 create mode 100644 test cases/unit/67 rpath-link secondary/libA/liba.c
 create mode 100644 test cases/unit/67 rpath-link secondary/libA/liba.h
 create mode 100644 test cases/unit/67 rpath-link secondary/libA/meson.build
 create mode 100644 test cases/unit/67 rpath-link secondary/libB/libb.c
 create mode 100644 test cases/unit/67 rpath-link secondary/libB/libb.h
 create mode 100644 test cases/unit/67 rpath-link secondary/libB/meson.build

diff --git a/run_unittests.py b/run_unittests.py
index eedb087dd..04d67a84c 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5300,7 +5300,7 @@ endian = 'little'
         required for dependencies of dependencies (i.e. secondary dependencies).
         '''
         with tempfile.TemporaryDirectory() as tempdirname:
-            testdirbase = os.path.join(self.unit_test_dir, '63 rpath-link secondary')
+            testdirbase = os.path.join(self.unit_test_dir, '67 rpath-link secondary')
 
             # build libA
             testdirlibA = os.path.join(testdirbase, 'libA')
diff --git a/test cases/unit/63 rpath-link secondary/app/app.c b/test cases/unit/63 rpath-link secondary/app/app.c
deleted file mode 100644
index f33b1a99e..000000000
--- a/test cases/unit/63 rpath-link secondary/app/app.c	
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <stdio.h>
-#include <libb.h>
-
-int main() { printf("The answer is: %d\n", libB_func()); }
diff --git a/test cases/unit/63 rpath-link secondary/app/meson.build b/test cases/unit/63 rpath-link secondary/app/meson.build
deleted file mode 100644
index 3d85a32f4..000000000
--- a/test cases/unit/63 rpath-link secondary/app/meson.build	
+++ /dev/null
@@ -1,5 +0,0 @@
-project('app', ['c'])
-
-b = dependency('test-b')
-
-executable('app', 'app.c', dependencies : [b])
diff --git a/test cases/unit/63 rpath-link secondary/libA/liba.c b/test cases/unit/63 rpath-link secondary/libA/liba.c
deleted file mode 100644
index 620a9949d..000000000
--- a/test cases/unit/63 rpath-link secondary/libA/liba.c	
+++ /dev/null
@@ -1 +0,0 @@
-int libA_func() { return 42; }
diff --git a/test cases/unit/63 rpath-link secondary/libA/liba.h b/test cases/unit/63 rpath-link secondary/libA/liba.h
deleted file mode 100644
index ed4fa7ddc..000000000
--- a/test cases/unit/63 rpath-link secondary/libA/liba.h	
+++ /dev/null
@@ -1 +0,0 @@
-int libA_func();
diff --git a/test cases/unit/63 rpath-link secondary/libA/meson.build b/test cases/unit/63 rpath-link secondary/libA/meson.build
deleted file mode 100644
index 383bed026..000000000
--- a/test cases/unit/63 rpath-link secondary/libA/meson.build	
+++ /dev/null
@@ -1,14 +0,0 @@
-project('lib', ['c'])
-
-a = library('test-a', 'liba.c', install: true)
-
-install_headers(files('liba.h'))
-
-import('pkgconfig').generate(
-    a,
-    version: '0.0',
-    description: 'test library',
-    filebase: 'test-a',
-    name: 'test library',
-    subdirs: ['.']
-)
diff --git a/test cases/unit/63 rpath-link secondary/libB/libb.c b/test cases/unit/63 rpath-link secondary/libB/libb.c
deleted file mode 100644
index d097066c8..000000000
--- a/test cases/unit/63 rpath-link secondary/libB/libb.c	
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <liba.h>
-
-int libB_func() { return libA_func(); }
diff --git a/test cases/unit/63 rpath-link secondary/libB/libb.h b/test cases/unit/63 rpath-link secondary/libB/libb.h
deleted file mode 100644
index c5de0c22d..000000000
--- a/test cases/unit/63 rpath-link secondary/libB/libb.h	
+++ /dev/null
@@ -1 +0,0 @@
-int libB_func();
diff --git a/test cases/unit/63 rpath-link secondary/libB/meson.build b/test cases/unit/63 rpath-link secondary/libB/meson.build
deleted file mode 100644
index 3bfd0d22e..000000000
--- a/test cases/unit/63 rpath-link secondary/libB/meson.build	
+++ /dev/null
@@ -1,16 +0,0 @@
-project('lib', ['c'])
-
-libA_dep = dependency('test-a')
-
-b = library('test-b', 'libb.c', install: true, dependencies : libA_dep)
-
-install_headers(files('libb.h'))
-
-import('pkgconfig').generate(
-    b,
-    version: '0.0',
-    description: 'test library',
-    filebase: 'test-b',
-    name: 'test library',
-    subdirs: ['.']
-)
diff --git a/test cases/unit/67 rpath-link secondary/app/app.c b/test cases/unit/67 rpath-link secondary/app/app.c
new file mode 100644
index 000000000..f33b1a99e
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/app/app.c	
@@ -0,0 +1,4 @@
+#include <stdio.h>
+#include <libb.h>
+
+int main() { printf("The answer is: %d\n", libB_func()); }
diff --git a/test cases/unit/67 rpath-link secondary/app/meson.build b/test cases/unit/67 rpath-link secondary/app/meson.build
new file mode 100644
index 000000000..3d85a32f4
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/app/meson.build	
@@ -0,0 +1,5 @@
+project('app', ['c'])
+
+b = dependency('test-b')
+
+executable('app', 'app.c', dependencies : [b])
diff --git a/test cases/unit/67 rpath-link secondary/libA/liba.c b/test cases/unit/67 rpath-link secondary/libA/liba.c
new file mode 100644
index 000000000..620a9949d
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/libA/liba.c	
@@ -0,0 +1 @@
+int libA_func() { return 42; }
diff --git a/test cases/unit/67 rpath-link secondary/libA/liba.h b/test cases/unit/67 rpath-link secondary/libA/liba.h
new file mode 100644
index 000000000..ed4fa7ddc
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/libA/liba.h	
@@ -0,0 +1 @@
+int libA_func();
diff --git a/test cases/unit/67 rpath-link secondary/libA/meson.build b/test cases/unit/67 rpath-link secondary/libA/meson.build
new file mode 100644
index 000000000..383bed026
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/libA/meson.build	
@@ -0,0 +1,14 @@
+project('lib', ['c'])
+
+a = library('test-a', 'liba.c', install: true)
+
+install_headers(files('liba.h'))
+
+import('pkgconfig').generate(
+    a,
+    version: '0.0',
+    description: 'test library',
+    filebase: 'test-a',
+    name: 'test library',
+    subdirs: ['.']
+)
diff --git a/test cases/unit/67 rpath-link secondary/libB/libb.c b/test cases/unit/67 rpath-link secondary/libB/libb.c
new file mode 100644
index 000000000..d097066c8
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/libB/libb.c	
@@ -0,0 +1,3 @@
+#include <liba.h>
+
+int libB_func() { return libA_func(); }
diff --git a/test cases/unit/67 rpath-link secondary/libB/libb.h b/test cases/unit/67 rpath-link secondary/libB/libb.h
new file mode 100644
index 000000000..c5de0c22d
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/libB/libb.h	
@@ -0,0 +1 @@
+int libB_func();
diff --git a/test cases/unit/67 rpath-link secondary/libB/meson.build b/test cases/unit/67 rpath-link secondary/libB/meson.build
new file mode 100644
index 000000000..3bfd0d22e
--- /dev/null
+++ b/test cases/unit/67 rpath-link secondary/libB/meson.build	
@@ -0,0 +1,16 @@
+project('lib', ['c'])
+
+libA_dep = dependency('test-a')
+
+b = library('test-b', 'libb.c', install: true, dependencies : libA_dep)
+
+install_headers(files('libb.h'))
+
+import('pkgconfig').generate(
+    b,
+    version: '0.0',
+    description: 'test library',
+    filebase: 'test-b',
+    name: 'test library',
+    subdirs: ['.']
+)
-- 
cgit v1.2.3