Cleanup: move test.h to libutil

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

17 files changed, 27 insertions, 29 deletions

diff --git a/tests/libfstree/Makemodule.am b/tests/libfstree/Makemodule.am
index 6b45ece..a79d670 100644
--- a/tests/libfstree/Makemodule.am
+++ b/tests/libfstree/Makemodule.am
@@ -1,50 +1,48 @@
 FSTDATADIR=$(top_srcdir)/tests/libfstree
 
 test_canonicalize_name_SOURCES = tests/libfstree/canonicalize_name.c
-test_canonicalize_name_SOURCES += tests/test.h
 test_canonicalize_name_LDADD = libfstree.a libcompat.a
 
-test_mknode_simple_SOURCES = tests/libfstree/mknode_simple.c tests/test.h
+test_mknode_simple_SOURCES = tests/libfstree/mknode_simple.c
 test_mknode_simple_LDADD = libfstree.a libcompat.a
 
-test_mknode_slink_SOURCES = tests/libfstree/mknode_slink.c tests/test.h
+test_mknode_slink_SOURCES = tests/libfstree/mknode_slink.c
 test_mknode_slink_LDADD = libfstree.a libcompat.a
 
-test_mknode_reg_SOURCES = tests/libfstree/mknode_reg.c tests/test.h
+test_mknode_reg_SOURCES = tests/libfstree/mknode_reg.c
 test_mknode_reg_LDADD = libfstree.a libcompat.a
 
-test_mknode_dir_SOURCES = tests/libfstree/mknode_dir.c tests/test.h
+test_mknode_dir_SOURCES = tests/libfstree/mknode_dir.c
 test_mknode_dir_LDADD = libfstree.a libcompat.a
 
 test_gen_inode_numbers_SOURCES = tests/libfstree/gen_inode_numbers.c
-test_gen_inode_numbers_SOURCES += tests/test.h
 test_gen_inode_numbers_LDADD = libfstree.a libcompat.a
 
-test_add_by_path_SOURCES = tests/libfstree/add_by_path.c tests/test.h
+test_add_by_path_SOURCES = tests/libfstree/add_by_path.c
 test_add_by_path_LDADD = libfstree.a libcompat.a
 
-test_get_path_SOURCES = tests/libfstree/get_path.c tests/test.h
+test_get_path_SOURCES = tests/libfstree/get_path.c
 test_get_path_LDADD = libfstree.a libcompat.a
 
-test_fstree_sort_SOURCES = tests/libfstree/fstree_sort.c tests/test.h
+test_fstree_sort_SOURCES = tests/libfstree/fstree_sort.c
 test_fstree_sort_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree
 test_fstree_sort_LDADD = libfstree.a libio.a libcompat.a
 
-test_fstree_from_file_SOURCES = tests/libfstree/fstree_from_file.c tests/test.h
+test_fstree_from_file_SOURCES = tests/libfstree/fstree_from_file.c
 test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS)
 test_fstree_from_file_CPPFLAGS += -DTESTPATH=$(FSTDATADIR)/fstree1.txt
 test_fstree_from_file_LDADD = libfstree.a libio.a libcompat.a
 
-test_fstree_glob1_SOURCES = tests/libfstree/fstree_glob1.c tests/test.h
+test_fstree_glob1_SOURCES = tests/libfstree/fstree_glob1.c
 test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(FSTDATADIR)
 test_fstree_glob1_LDADD = libfstree.a libio.a libcompat.a
 
-test_fstree_from_dir_SOURCES = tests/libfstree/fstree_from_dir.c tests/test.h
+test_fstree_from_dir_SOURCES = tests/libfstree/fstree_from_dir.c
 test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS)
 test_fstree_from_dir_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/libtar/data
 test_fstree_from_dir_LDADD = libfstree.a libcompat.a
 
-test_fstree_init_SOURCES = tests/libfstree/fstree_init.c tests/test.h
+test_fstree_init_SOURCES = tests/libfstree/fstree_init.c
 test_fstree_init_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree
 test_fstree_init_LDADD = libfstree.a libio.a libcompat.a
 
diff --git a/tests/libfstree/add_by_path.c b/tests/libfstree/add_by_path.c
index b21c696..97e5a60 100644
--- a/tests/libfstree/add_by_path.c
+++ b/tests/libfstree/add_by_path.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/canonicalize_name.c b/tests/libfstree/canonicalize_name.c
index f1eb1c1..f117a0d 100644
--- a/tests/libfstree/canonicalize_name.c
+++ b/tests/libfstree/canonicalize_name.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 static const struct {
 	const char *in;
diff --git a/tests/libfstree/epoch.c b/tests/libfstree/epoch.c
index 354a33f..ce7e120 100644
--- a/tests/libfstree/epoch.c
+++ b/tests/libfstree/epoch.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 #include "internal.h"
-#include "../test.h"
+#include "util/test.h"
 
 #if defined(_WIN32) || defined(__WINDOWS__)
 static void setenv(const char *key, const char *value, int overwrite)
diff --git a/tests/libfstree/filename_sane.c b/tests/libfstree/filename_sane.c
index 11f27da..a1dc79c 100644
--- a/tests/libfstree/filename_sane.c
+++ b/tests/libfstree/filename_sane.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 static const char *must_work[] = {
 	"foobar",
diff --git a/tests/libfstree/fstree_from_dir.c b/tests/libfstree/fstree_from_dir.c
index 845586f..438e357 100644
--- a/tests/libfstree/fstree_from_dir.c
+++ b/tests/libfstree/fstree_from_dir.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 static void check_hierarchy(tree_node_t *root, bool recursive)
 {
diff --git a/tests/libfstree/fstree_from_file.c b/tests/libfstree/fstree_from_file.c
index 08277e6..184c011 100644
--- a/tests/libfstree/fstree_from_file.c
+++ b/tests/libfstree/fstree_from_file.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/fstree_glob1.c b/tests/libfstree/fstree_glob1.c
index 08e39bd..3aff21a 100644
--- a/tests/libfstree/fstree_glob1.c
+++ b/tests/libfstree/fstree_glob1.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive)
 {
diff --git a/tests/libfstree/fstree_init.c b/tests/libfstree/fstree_init.c
index 5f701cb..92bbc19 100644
--- a/tests/libfstree/fstree_init.c
+++ b/tests/libfstree/fstree_init.c
@@ -8,7 +8,7 @@
 
 #include "fstree.h"
 #include "internal.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/fstree_sort.c b/tests/libfstree/fstree_sort.c
index 6db607d..7df85f5 100644
--- a/tests/libfstree/fstree_sort.c
+++ b/tests/libfstree/fstree_sort.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/gen_inode_numbers.c b/tests/libfstree/gen_inode_numbers.c
index eef5678..5403580 100644
--- a/tests/libfstree/gen_inode_numbers.c
+++ b/tests/libfstree/gen_inode_numbers.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 static tree_node_t *gen_node(tree_node_t *parent, const char *name)
 {
diff --git a/tests/libfstree/get_path.c b/tests/libfstree/get_path.c
index 26dd9ea..61001e9 100644
--- a/tests/libfstree/get_path.c
+++ b/tests/libfstree/get_path.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/mknode_dir.c b/tests/libfstree/mknode_dir.c
index 63e01c1..dd7eba7 100644
--- a/tests/libfstree/mknode_dir.c
+++ b/tests/libfstree/mknode_dir.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/mknode_reg.c b/tests/libfstree/mknode_reg.c
index debecd9..368720f 100644
--- a/tests/libfstree/mknode_reg.c
+++ b/tests/libfstree/mknode_reg.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/mknode_simple.c b/tests/libfstree/mknode_simple.c
index 4e8978c..c7efb49 100644
--- a/tests/libfstree/mknode_simple.c
+++ b/tests/libfstree/mknode_simple.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/mknode_slink.c b/tests/libfstree/mknode_slink.c
index 4b23951..c50a0ba 100644
--- a/tests/libfstree/mknode_slink.c
+++ b/tests/libfstree/mknode_slink.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libfstree/sort_file.c b/tests/libfstree/sort_file.c
index 686ee68..93d60e0 100644
--- a/tests/libfstree/sort_file.c
+++ b/tests/libfstree/sort_file.c
@@ -8,7 +8,7 @@
 
 #include "sqfs/block.h"
 #include "fstree.h"
-#include "../test.h"
+#include "util/test.h"
 
 static const char *listing =
 "dir /bin 0755 0 0\n"