From 54ee2670c0ad260431f77c09d4568980eecc42af Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 2 Nov 2020 11:41:54 +0100 Subject: Cleanup: eliminate the now practically empty test_tar.h Signed-off-by: David Oberhollenzer --- tests/Makemodule.am | 55 ++++++++++++++++++++++------------------------- tests/tar_big_file.c | 4 +++- tests/tar_simple.c | 4 +++- tests/tar_sparse.c | 4 +++- tests/tar_sparse_gnu.c | 4 +++- tests/tar_target_filled.c | 4 +++- tests/tar_xattr.c | 4 +++- tests/tar_xattr_bin.c | 4 +++- tests/test_tar.h | 14 ------------ 9 files changed, 47 insertions(+), 50 deletions(-) delete mode 100644 tests/test_tar.h (limited to 'tests') diff --git a/tests/Makemodule.am b/tests/Makemodule.am index 651f61c..7b86af9 100644 --- a/tests/Makemodule.am +++ b/tests/Makemodule.am @@ -61,164 +61,161 @@ test_filename_sane_w32_SOURCES = tests/filename_sane.c test_filename_sane_w32_SOURCES += lib/fstree/filename_sane.c test_filename_sane_w32_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_WIN32=1 -test_tar_gnu0_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_gnu0_SOURCES = tests/tar_simple.c tests/test.h test_tar_gnu0_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_gnu0_CPPFLAGS += -DTESTFILE=format-acceptance/gnu.tar -test_tar_gnu1_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_gnu1_SOURCES = tests/tar_simple.c tests/test.h test_tar_gnu1_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_gnu1_CPPFLAGS += -DTESTFILE=format-acceptance/gnu-g.tar -test_tar_gnu2_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_gnu2_SOURCES = tests/tar_simple.c tests/test.h test_tar_gnu2_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar 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/tar_simple.c tests/test.h tests/test_tar.h +test_tar_gnu3_SOURCES = tests/tar_simple.c tests/test.h test_tar_gnu3_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_gnu3_CPPFLAGS += -DTESTFILE=negative-mtime/gnu.tar -DTESTTS=-315622800 -test_tar_gnu4_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_gnu4_SOURCES = tests/tar_simple.c tests/test.h test_tar_gnu4_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_gnu4_CPPFLAGS += -DTESTFILE=long-paths/gnu.tar -DLONG_NAME_TEST test_tar_gnu4_CPPFLAGS += -DTESTTS=1542909670 -test_tar_gnu5_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_gnu5_SOURCES = tests/tar_simple.c tests/test.h test_tar_gnu5_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_gnu5_CPPFLAGS += -DTESTFILE=large-mtime/gnu.tar -DTESTTS=8589934592L -test_tar_gnu6_SOURCES = tests/tar_big_file.c tests/test.h tests/test_tar.h +test_tar_gnu6_SOURCES = tests/tar_big_file.c tests/test.h test_tar_gnu6_LDADD = libtar.a libfstream.a libcompat.a test_tar_gnu6_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_gnu6_CPPFLAGS += -DTESTFILE=file-size/gnu.tar -test_tar_pax0_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_pax0_SOURCES = tests/tar_simple.c tests/test.h test_tar_pax0_LDADD = libtar.a libfstream.a libcompat.a test_tar_pax0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_pax0_CPPFLAGS += -DTESTFILE=format-acceptance/pax.tar -test_tar_pax1_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_pax1_SOURCES = tests/tar_simple.c tests/test.h test_tar_pax1_LDADD = libtar.a libfstream.a libcompat.a test_tar_pax1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar 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/tar_simple.c tests/test.h tests/test_tar.h +test_tar_pax2_SOURCES = tests/tar_simple.c tests/test.h test_tar_pax2_LDADD = libtar.a libfstream.a libcompat.a test_tar_pax2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_pax2_CPPFLAGS += -DTESTFILE=large-mtime/pax.tar -DTESTTS=8589934592L -test_tar_pax3_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_pax3_SOURCES = tests/tar_simple.c tests/test.h test_tar_pax3_LDADD = libtar.a libfstream.a libcompat.a test_tar_pax3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_pax3_CPPFLAGS += -DTESTFILE=negative-mtime/pax.tar -DTESTTS=-315622800 -test_tar_pax4_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_pax4_SOURCES = tests/tar_simple.c tests/test.h test_tar_pax4_LDADD = libtar.a libfstream.a libcompat.a test_tar_pax4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_pax4_CPPFLAGS += -DTESTFILE=long-paths/pax.tar test_tar_pax4_CPPFLAGS += -DLONG_NAME_TEST -DTESTTS=1542909670 -test_tar_pax5_SOURCES = tests/tar_big_file.c tests/test.h tests/test_tar.h +test_tar_pax5_SOURCES = tests/tar_big_file.c tests/test.h test_tar_pax5_LDADD = libtar.a libfstream.a libcompat.a test_tar_pax5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_pax5_CPPFLAGS += -DTESTFILE=file-size/pax.tar -test_tar_ustar0_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_ustar0_SOURCES = tests/tar_simple.c tests/test.h test_tar_ustar0_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar0_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar0_CPPFLAGS += -DTESTFILE=format-acceptance/ustar.tar -test_tar_ustar1_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_ustar1_SOURCES = tests/tar_simple.c tests/test.h test_tar_ustar1_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar1_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar1_CPPFLAGS += -DTESTFILE=format-acceptance/ustar-pre-posix.tar -test_tar_ustar2_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_ustar2_SOURCES = tests/tar_simple.c tests/test.h test_tar_ustar2_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar2_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar2_CPPFLAGS += -DTESTFILE=format-acceptance/v7.tar -test_tar_ustar3_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_ustar3_SOURCES = tests/tar_simple.c tests/test.h test_tar_ustar3_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar3_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar 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/tar_simple.c tests/test.h tests/test_tar.h +test_tar_ustar4_SOURCES = tests/tar_simple.c tests/test.h test_tar_ustar4_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar4_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar4_CPPFLAGS += -DTESTFILE=large-mtime/12-digit.tar test_tar_ustar4_CPPFLAGS += -DTESTTS=8589934592L -test_tar_ustar5_SOURCES = tests/tar_simple.c tests/test.h tests/test_tar.h +test_tar_ustar5_SOURCES = tests/tar_simple.c tests/test.h test_tar_ustar5_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar5_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar5_CPPFLAGS += -DTESTFILE=long-paths/ustar.tar test_tar_ustar5_CPPFLAGS += -DLONG_NAME_TEST -DTESTTS=1542909670 -test_tar_ustar6_SOURCES = tests/tar_big_file.c tests/test.h tests/test_tar.h +test_tar_ustar6_SOURCES = tests/tar_big_file.c tests/test.h test_tar_ustar6_LDADD = libtar.a libfstream.a libcompat.a test_tar_ustar6_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar6_CPPFLAGS += -DTESTFILE=file-size/12-digit.tar test_tar_target_filled_SOURCES = tests/tar_target_filled.c tests/test.h -test_tar_target_filled_SOURCES += tests/test_tar.h test_tar_target_filled_LDADD = libtar.a libfstream.a libcompat.a test_tar_target_filled_CPPFLAGS = $(AM_CPPFLAGS) test_tar_target_filled_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu_SOURCES = tests/tar_sparse_gnu.c tests/test.h -test_tar_sparse_gnu_SOURCES += tests/test_tar.h test_tar_sparse_gnu_LDADD = libtar.a libfstream.a libcompat.a test_tar_sparse_gnu_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar -test_tar_sparse_gnu0_SOURCES = tests/tar_sparse.c tests/test.h tests/test_tar.h +test_tar_sparse_gnu0_SOURCES = tests/tar_sparse.c tests/test.h test_tar_sparse_gnu0_LDADD = libtar.a libfstream.a libcompat.a test_tar_sparse_gnu0_CPPFLAGS = $(AM_CPPFLAGS) test_tar_sparse_gnu0_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu0_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu0-0.tar -test_tar_sparse_gnu1_SOURCES = tests/tar_sparse.c tests/test.h tests/test_tar.h +test_tar_sparse_gnu1_SOURCES = tests/tar_sparse.c tests/test.h test_tar_sparse_gnu1_LDADD = libtar.a libfstream.a libcompat.a test_tar_sparse_gnu1_CPPFLAGS = $(AM_CPPFLAGS) test_tar_sparse_gnu1_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu1_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu0-1.tar -test_tar_sparse_gnu2_SOURCES = tests/tar_sparse.c tests/test.h tests/test_tar.h +test_tar_sparse_gnu2_SOURCES = tests/tar_sparse.c tests/test.h test_tar_sparse_gnu2_LDADD = libtar.a libfstream.a libcompat.a test_tar_sparse_gnu2_CPPFLAGS = $(AM_CPPFLAGS) test_tar_sparse_gnu2_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu2_CPPFLAGS += -DTESTFILE=sparse-files/pax-gnu1-0.tar -test_tar_sparse_gnu3_SOURCES = tests/tar_sparse.c tests/test.h tests/test_tar.h +test_tar_sparse_gnu3_SOURCES = tests/tar_sparse.c tests/test.h test_tar_sparse_gnu3_LDADD = libtar.a libfstream.a libcompat.a test_tar_sparse_gnu3_CPPFLAGS = $(AM_CPPFLAGS) test_tar_sparse_gnu3_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu3_CPPFLAGS += -DTESTFILE=sparse-files/gnu.tar -test_tar_xattr_bsd_SOURCES = tests/tar_xattr.c tests/test.h tests/test_tar.h +test_tar_xattr_bsd_SOURCES = tests/tar_xattr.c tests/test.h test_tar_xattr_bsd_LDADD = libtar.a libfstream.a libcompat.a test_tar_xattr_bsd_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_xattr_bsd_CPPFLAGS += -DTESTFILE=xattr/xattr-libarchive.tar -test_tar_xattr_schily_SOURCES = tests/tar_xattr.c tests/test.h tests/test_tar.h +test_tar_xattr_schily_SOURCES = tests/tar_xattr.c tests/test.h test_tar_xattr_schily_LDADD = libtar.a libfstream.a libcompat.a test_tar_xattr_schily_CPPFLAGS = $(AM_CPPFLAGS) test_tar_xattr_schily_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_xattr_schily_CPPFLAGS += -DTESTFILE=xattr/xattr-schily.tar test_tar_xattr_schily_bin_SOURCES = tests/tar_xattr_bin.c tests/test.h -test_tar_xattr_schily_bin_SOURCES += tests/test_tar.h test_tar_xattr_schily_bin_LDADD = libtar.a libfstream.a libcompat.a test_tar_xattr_schily_bin_CPPFLAGS = $(AM_CPPFLAGS) test_tar_xattr_schily_bin_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar diff --git a/tests/tar_big_file.c b/tests/tar_big_file.c index 66e4690..c9fbcc5 100644 --- a/tests/tar_big_file.c +++ b/tests/tar_big_file.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" int main(void) { diff --git a/tests/tar_simple.c b/tests/tar_simple.c index 6c5a47e..fb30205 100644 --- a/tests/tar_simple.c +++ b/tests/tar_simple.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" #ifndef TESTUID #define TESTUID 1000 diff --git a/tests/tar_sparse.c b/tests/tar_sparse.c index 8e2976f..79d2041 100644 --- a/tests/tar_sparse.c +++ b/tests/tar_sparse.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" static void test_case_sparse(const char *path) { diff --git a/tests/tar_sparse_gnu.c b/tests/tar_sparse_gnu.c index c1854a1..536ec21 100644 --- a/tests/tar_sparse_gnu.c +++ b/tests/tar_sparse_gnu.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" int main(void) { diff --git a/tests/tar_target_filled.c b/tests/tar_target_filled.c index 7032239..3ab2421 100644 --- a/tests/tar_target_filled.c +++ b/tests/tar_target_filled.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" int main(void) { diff --git a/tests/tar_xattr.c b/tests/tar_xattr.c index e06b428..d864ba3 100644 --- a/tests/tar_xattr.c +++ b/tests/tar_xattr.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" int main(void) { diff --git a/tests/tar_xattr_bin.c b/tests/tar_xattr_bin.c index 88bf3fd..5f45c15 100644 --- a/tests/tar_xattr_bin.c +++ b/tests/tar_xattr_bin.c @@ -4,7 +4,9 @@ * * Copyright (C) 2019 David Oberhollenzer */ -#include "test_tar.h" +#include "config.h" +#include "tar.h" +#include "test.h" static const uint8_t value[] = { 0x00, 0x00, 0x00, 0x02, diff --git a/tests/test_tar.h b/tests/test_tar.h deleted file mode 100644 index 0d5ccc1..0000000 --- a/tests/test_tar.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * test_tar.h - * - * Copyright (C) 2019 David Oberhollenzer - */ -#ifndef TEST_TAR_H -#define TEST_TAR_H - -#include "config.h" -#include "tar.h" -#include "test.h" - -#endif /* TEST_TAR_H */ -- cgit v1.2.3