From 86a947b9446b9b5d881d1a974cfe1bcde9d08f2f Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 2 Jul 2022 20:40:41 +0200 Subject: Cleanup: move test.h to libutil Signed-off-by: David Oberhollenzer --- tests/libtar/Makemodule.am | 58 ++++++++++++++++++++-------------------- tests/libtar/tar_big_file.c | 2 +- tests/libtar/tar_simple.c | 2 +- tests/libtar/tar_sparse.c | 2 +- tests/libtar/tar_sparse_gnu.c | 2 +- tests/libtar/tar_target_filled.c | 2 +- tests/libtar/tar_xattr.c | 2 +- tests/libtar/tar_xattr_bin.c | 2 +- 8 files changed, 36 insertions(+), 36 deletions(-) (limited to 'tests/libtar') diff --git a/tests/libtar/Makemodule.am b/tests/libtar/Makemodule.am index b042f74..145481a 100644 --- a/tests/libtar/Makemodule.am +++ b/tests/libtar/Makemodule.am @@ -1,154 +1,154 @@ TARDATADIR=$(top_srcdir)/tests/libtar/data -test_tar_gnu0_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_gnu0_SOURCES = tests/libtar/tar_simple.c test_tar_gnu0_LDADD = libtar.a libio.a libcompat.a test_tar_gnu0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu0_CPPFLAGS += -DTESTFILE=format-acceptance/gnu.tar -test_tar_gnu1_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_gnu1_SOURCES = tests/libtar/tar_simple.c test_tar_gnu1_LDADD = libtar.a libio.a libcompat.a test_tar_gnu1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu1_CPPFLAGS += -DTESTFILE=format-acceptance/gnu-g.tar -test_tar_gnu2_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_gnu2_SOURCES = tests/libtar/tar_simple.c test_tar_gnu2_LDADD = libtar.a libio.a libcompat.a test_tar_gnu2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu2_CPPFLAGS += -DTESTFILE=user-group-largenum/gnu.tar test_tar_gnu2_CPPFLAGS += -DTESTUID=0x80000000 -DTESTGID=0x80000000 test_tar_gnu2_CPPFLAGS += -DTESTTS=1542995392 -test_tar_gnu3_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_gnu3_SOURCES = tests/libtar/tar_simple.c test_tar_gnu3_LDADD = libtar.a libio.a libcompat.a test_tar_gnu3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu3_CPPFLAGS += -DTESTFILE=negative-mtime/gnu.tar -DTESTTS=-315622800 -test_tar_gnu4_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_gnu4_SOURCES = tests/libtar/tar_simple.c test_tar_gnu4_LDADD = libtar.a libio.a libcompat.a test_tar_gnu4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu4_CPPFLAGS += -DTESTFILE=long-paths/gnu.tar -DLONG_NAME_TEST test_tar_gnu4_CPPFLAGS += -DTESTTS=1542909670 -test_tar_gnu5_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_gnu5_SOURCES = tests/libtar/tar_simple.c test_tar_gnu5_LDADD = libtar.a libio.a libcompat.a test_tar_gnu5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu5_CPPFLAGS += -DTESTFILE=large-mtime/gnu.tar -DTESTTS=8589934592L -test_tar_gnu6_SOURCES = tests/libtar/tar_big_file.c tests/test.h +test_tar_gnu6_SOURCES = tests/libtar/tar_big_file.c test_tar_gnu6_LDADD = libtar.a libio.a libcompat.a test_tar_gnu6_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_gnu6_CPPFLAGS += -DTESTFILE=file-size/gnu.tar -test_tar_pax0_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_pax0_SOURCES = tests/libtar/tar_simple.c test_tar_pax0_LDADD = libtar.a libio.a libcompat.a test_tar_pax0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax0_CPPFLAGS += -DTESTFILE=format-acceptance/pax.tar -test_tar_pax1_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_pax1_SOURCES = tests/libtar/tar_simple.c test_tar_pax1_LDADD = libtar.a libio.a libcompat.a test_tar_pax1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax1_CPPFLAGS += -DTESTFILE=user-group-largenum/pax.tar test_tar_pax1_CPPFLAGS += -DTESTUID=2147483648UL -DTESTGID=2147483648UL test_tar_pax1_CPPFLAGS += -DTESTTS=1542995392 -test_tar_pax2_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_pax2_SOURCES = tests/libtar/tar_simple.c test_tar_pax2_LDADD = libtar.a libio.a libcompat.a test_tar_pax2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax2_CPPFLAGS += -DTESTFILE=large-mtime/pax.tar -DTESTTS=8589934592L -test_tar_pax3_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_pax3_SOURCES = tests/libtar/tar_simple.c test_tar_pax3_LDADD = libtar.a libio.a libcompat.a test_tar_pax3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax3_CPPFLAGS += -DTESTFILE=negative-mtime/pax.tar -DTESTTS=-315622800 -test_tar_pax4_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_pax4_SOURCES = tests/libtar/tar_simple.c test_tar_pax4_LDADD = libtar.a libio.a libcompat.a test_tar_pax4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax4_CPPFLAGS += -DTESTFILE=long-paths/pax.tar test_tar_pax4_CPPFLAGS += -DLONG_NAME_TEST -DTESTTS=1542909670 -test_tar_pax5_SOURCES = tests/libtar/tar_big_file.c tests/test.h +test_tar_pax5_SOURCES = tests/libtar/tar_big_file.c test_tar_pax5_LDADD = libtar.a libio.a libcompat.a test_tar_pax5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_pax5_CPPFLAGS += -DTESTFILE=file-size/pax.tar -test_tar_ustar0_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_ustar0_SOURCES = tests/libtar/tar_simple.c test_tar_ustar0_LDADD = libtar.a libio.a libcompat.a test_tar_ustar0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar0_CPPFLAGS += -DTESTFILE=format-acceptance/ustar.tar -test_tar_ustar1_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_ustar1_SOURCES = tests/libtar/tar_simple.c test_tar_ustar1_LDADD = libtar.a libio.a libcompat.a test_tar_ustar1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar1_CPPFLAGS += -DTESTFILE=format-acceptance/ustar-pre-posix.tar -test_tar_ustar2_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_ustar2_SOURCES = tests/libtar/tar_simple.c test_tar_ustar2_LDADD = libtar.a libio.a libcompat.a test_tar_ustar2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar2_CPPFLAGS += -DTESTFILE=format-acceptance/v7.tar -test_tar_ustar3_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_ustar3_SOURCES = tests/libtar/tar_simple.c test_tar_ustar3_LDADD = libtar.a libio.a libcompat.a test_tar_ustar3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar3_CPPFLAGS += -DTESTFILE=user-group-largenum/8-digit.tar test_tar_ustar3_CPPFLAGS += -DTESTUID=8388608 -DTESTGID=8388608 test_tar_ustar3_CPPFLAGS += -DTESTTS=1542995392 -test_tar_ustar4_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_ustar4_SOURCES = tests/libtar/tar_simple.c test_tar_ustar4_LDADD = libtar.a libio.a libcompat.a test_tar_ustar4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar4_CPPFLAGS += -DTESTFILE=large-mtime/12-digit.tar test_tar_ustar4_CPPFLAGS += -DTESTTS=8589934592L -test_tar_ustar5_SOURCES = tests/libtar/tar_simple.c tests/test.h +test_tar_ustar5_SOURCES = tests/libtar/tar_simple.c test_tar_ustar5_LDADD = libtar.a libio.a libcompat.a test_tar_ustar5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar5_CPPFLAGS += -DTESTFILE=long-paths/ustar.tar test_tar_ustar5_CPPFLAGS += -DLONG_NAME_TEST -DTESTTS=1542909670 -test_tar_ustar6_SOURCES = tests/libtar/tar_big_file.c tests/test.h +test_tar_ustar6_SOURCES = tests/libtar/tar_big_file.c test_tar_ustar6_LDADD = libtar.a libio.a libcompat.a test_tar_ustar6_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_ustar6_CPPFLAGS += -DTESTFILE=file-size/12-digit.tar -test_tar_target_filled_SOURCES = tests/libtar/tar_target_filled.c tests/test.h +test_tar_target_filled_SOURCES = tests/libtar/tar_target_filled.c test_tar_target_filled_LDADD = libtar.a libio.a libcompat.a test_tar_target_filled_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) -test_tar_sparse_gnu_SOURCES = tests/libtar/tar_sparse_gnu.c tests/test.h +test_tar_sparse_gnu_SOURCES = tests/libtar/tar_sparse_gnu.c test_tar_sparse_gnu_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) -test_tar_sparse_gnu0_SOURCES = tests/libtar/tar_sparse.c tests/test.h +test_tar_sparse_gnu0_SOURCES = tests/libtar/tar_sparse.c test_tar_sparse_gnu0_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu0_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu0-0.tar -test_tar_sparse_gnu1_SOURCES = tests/libtar/tar_sparse.c tests/test.h +test_tar_sparse_gnu1_SOURCES = tests/libtar/tar_sparse.c test_tar_sparse_gnu1_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu1_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu0-1.tar -test_tar_sparse_gnu2_SOURCES = tests/libtar/tar_sparse.c tests/test.h +test_tar_sparse_gnu2_SOURCES = tests/libtar/tar_sparse.c test_tar_sparse_gnu2_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu2_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu1-0.tar -test_tar_sparse_gnu3_SOURCES = tests/libtar/tar_sparse.c tests/test.h +test_tar_sparse_gnu3_SOURCES = tests/libtar/tar_sparse.c test_tar_sparse_gnu3_LDADD = libtar.a libio.a libcompat.a test_tar_sparse_gnu3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_sparse_gnu3_CPPFLAGS += -DTESTFILE=sparse-files/gnu.tar -test_tar_xattr_bsd_SOURCES = tests/libtar/tar_xattr.c tests/test.h +test_tar_xattr_bsd_SOURCES = tests/libtar/tar_xattr.c test_tar_xattr_bsd_LDADD = libtar.a libio.a libcompat.a test_tar_xattr_bsd_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_bsd_CPPFLAGS += -DTESTFILE=xattr/xattr-libarchive.tar -test_tar_xattr_schily_SOURCES = tests/libtar/tar_xattr.c tests/test.h +test_tar_xattr_schily_SOURCES = tests/libtar/tar_xattr.c test_tar_xattr_schily_LDADD = libtar.a libio.a libcompat.a test_tar_xattr_schily_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_schily_CPPFLAGS += -DTESTFILE=xattr/xattr-schily.tar -test_tar_xattr_schily_bin_SOURCES = tests/libtar/tar_xattr_bin.c tests/test.h +test_tar_xattr_schily_bin_SOURCES = tests/libtar/tar_xattr_bin.c test_tar_xattr_schily_bin_LDADD = libtar.a libio.a libcompat.a test_tar_xattr_schily_bin_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(TARDATADIR) test_tar_xattr_schily_bin_CPPFLAGS += -DTESTFILE=xattr/xattr-schily-binary.tar diff --git a/tests/libtar/tar_big_file.c b/tests/libtar/tar_big_file.c index 47332b7..dbeefac 100644 --- a/tests/libtar/tar_big_file.c +++ b/tests/libtar/tar_big_file.c @@ -7,7 +7,7 @@ #include "config.h" #include "tar/tar.h" #include "io/file.h" -#include "../test.h" +#include "util/test.h" int main(int argc, char **argv) { diff --git a/tests/libtar/tar_simple.c b/tests/libtar/tar_simple.c index d72044a..8879f05 100644 --- a/tests/libtar/tar_simple.c +++ b/tests/libtar/tar_simple.c @@ -7,7 +7,7 @@ #include "config.h" #include "io/file.h" #include "tar/tar.h" -#include "../test.h" +#include "util/test.h" #ifndef TESTUID #define TESTUID 1000 diff --git a/tests/libtar/tar_sparse.c b/tests/libtar/tar_sparse.c index 305e5e7..511c7ba 100644 --- a/tests/libtar/tar_sparse.c +++ b/tests/libtar/tar_sparse.c @@ -7,7 +7,7 @@ #include "config.h" #include "io/file.h" #include "tar/tar.h" -#include "../test.h" +#include "util/test.h" static void test_case_sparse(const char *path) { diff --git a/tests/libtar/tar_sparse_gnu.c b/tests/libtar/tar_sparse_gnu.c index 2ce7975..37167d3 100644 --- a/tests/libtar/tar_sparse_gnu.c +++ b/tests/libtar/tar_sparse_gnu.c @@ -7,7 +7,7 @@ #include "config.h" #include "io/file.h" #include "tar/tar.h" -#include "../test.h" +#include "util/test.h" int main(int argc, char **argv) { diff --git a/tests/libtar/tar_target_filled.c b/tests/libtar/tar_target_filled.c index 13b089f..6c83170 100644 --- a/tests/libtar/tar_target_filled.c +++ b/tests/libtar/tar_target_filled.c @@ -7,7 +7,7 @@ #include "config.h" #include "io/file.h" #include "tar/tar.h" -#include "../test.h" +#include "util/test.h" int main(int argc, char **argv) { diff --git a/tests/libtar/tar_xattr.c b/tests/libtar/tar_xattr.c index 5fc7064..4b3ed21 100644 --- a/tests/libtar/tar_xattr.c +++ b/tests/libtar/tar_xattr.c @@ -7,7 +7,7 @@ #include "config.h" #include "io/file.h" #include "tar/tar.h" -#include "../test.h" +#include "util/test.h" int main(int argc, char **argv) { diff --git a/tests/libtar/tar_xattr_bin.c b/tests/libtar/tar_xattr_bin.c index 8679c2d..b5644a1 100644 --- a/tests/libtar/tar_xattr_bin.c +++ b/tests/libtar/tar_xattr_bin.c @@ -7,7 +7,7 @@ #include "config.h" #include "io/file.h" #include "tar/tar.h" -#include "../test.h" +#include "util/test.h" static const uint8_t value[] = { 0x00, 0x00, 0x00, 0x02, -- cgit v1.2.3