From 94b547d27f953fefa0ed080611eb916f58702e87 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 25 Nov 2019 13:28:28 +0100 Subject: Cleanup: remove what is left of libutil Signed-off-by: David Oberhollenzer --- tests/Makemodule.am | 34 +++++++++++++++++----------------- tests/tar_fuzz.c | 1 - tests/tar_gnu.c | 1 - tests/tar_pax.c | 1 - tests/tar_sparse_gnu.c | 1 - tests/tar_sparse_gnu1.c | 1 - tests/tar_sparse_gnu2.c | 1 - tests/tar_ustar.c | 1 - tests/tar_xattr_bsd.c | 1 - tests/tar_xattr_schily.c | 1 - 10 files changed, 17 insertions(+), 26 deletions(-) (limited to 'tests') diff --git a/tests/Makemodule.am b/tests/Makemodule.am index 62cf813..51363e3 100644 --- a/tests/Makemodule.am +++ b/tests/Makemodule.am @@ -4,7 +4,7 @@ test_canonicalize_name_LDADD = libfstree.a test_str_table_SOURCES = tests/str_table.c lib/sqfs/str_table.c test_str_table_SOURCES += lib/sqfs/alloc.c lib/sqfs/util.h test_str_table_SOURCES += lib/sqfs/str_table.h -test_str_table_LDADD = libutil.la libcompat.a +test_str_table_LDADD = libcompat.a test_str_table_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests test_str_table_CPPFLAGS += -I$(top_srcdir)/lib/sqfs @@ -28,64 +28,64 @@ test_mknode_dir_SOURCES = tests/mknode_dir.c test_mknode_dir_LDADD = libfstree.a libcompat.a test_gen_inode_table_SOURCES = tests/gen_inode_table.c -test_gen_inode_table_LDADD = libfstree.a libutil.la libcompat.a +test_gen_inode_table_LDADD = libfstree.a libcompat.a test_add_by_path_SOURCES = tests/add_by_path.c -test_add_by_path_LDADD = libfstree.a libutil.la libcompat.a +test_add_by_path_LDADD = libfstree.a libcompat.a test_get_path_SOURCES = tests/get_path.c -test_get_path_LDADD = libfstree.a libutil.la libcompat.a +test_get_path_LDADD = libfstree.a libcompat.a test_fstree_sort_SOURCES = tests/fstree_sort.c -test_fstree_sort_LDADD = libfstree.a libutil.la libcompat.a +test_fstree_sort_LDADD = libfstree.a libcompat.a test_fstree_from_file_SOURCES = tests/fstree_from_file.c test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/fstree1.txt -test_fstree_from_file_LDADD = libfstree.a libutil.la libcompat.a +test_fstree_from_file_LDADD = libfstree.a libcompat.a test_fstree_init_SOURCES = tests/fstree_init.c -test_fstree_init_LDADD = libfstree.a libutil.la libcompat.a +test_fstree_init_LDADD = libfstree.a libcompat.a test_tar_gnu_SOURCES = tests/tar_gnu.c -test_tar_gnu_LDADD = libtar.a libcompat.a libutil.la +test_tar_gnu_LDADD = libtar.a libcompat.a test_tar_gnu_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_pax_SOURCES = tests/tar_pax.c -test_tar_pax_LDADD = libtar.a libcompat.a libutil.la +test_tar_pax_LDADD = libtar.a libcompat.a test_tar_pax_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_ustar_SOURCES = tests/tar_ustar.c -test_tar_ustar_LDADD = libtar.a libcompat.a libutil.la +test_tar_ustar_LDADD = libtar.a libcompat.a test_tar_ustar_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu_SOURCES = tests/tar_sparse_gnu.c -test_tar_sparse_gnu_LDADD = libtar.a libcompat.a libutil.la +test_tar_sparse_gnu_LDADD = libtar.a libcompat.a test_tar_sparse_gnu_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu1_SOURCES = tests/tar_sparse_gnu1.c -test_tar_sparse_gnu1_LDADD = libtar.a libcompat.a libutil.la +test_tar_sparse_gnu1_LDADD = libtar.a libcompat.a test_tar_sparse_gnu1_CPPFLAGS = $(AM_CPPFLAGS) test_tar_sparse_gnu1_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_sparse_gnu2_SOURCES = tests/tar_sparse_gnu1.c -test_tar_sparse_gnu2_LDADD = libtar.a libcompat.a libutil.la +test_tar_sparse_gnu2_LDADD = libtar.a libcompat.a test_tar_sparse_gnu2_CPPFLAGS = $(AM_CPPFLAGS) test_tar_sparse_gnu2_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar test_tar_xattr_bsd_SOURCES = tests/tar_xattr_bsd.c -test_tar_xattr_bsd_LDADD = libtar.a libcompat.a libutil.la +test_tar_xattr_bsd_LDADD = libtar.a libcompat.a test_tar_xattr_bsd_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests/tar test_tar_xattr_schily_SOURCES = tests/tar_xattr_schily.c -test_tar_xattr_schily_LDADD = libtar.a libcompat.a libutil.la +test_tar_xattr_schily_LDADD = libtar.a libcompat.a test_tar_xattr_schily_CPPFLAGS = $(AM_CPPFLAGS) test_tar_xattr_schily_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/tar fstree_fuzz_SOURCES = tests/fstree_fuzz.c -fstree_fuzz_LDADD = libfstree.a libcompat.a libutil.la +fstree_fuzz_LDADD = libfstree.a libcompat.a tar_fuzz_SOURCES = tests/tar_fuzz.c -tar_fuzz_LDADD = libtar.a libcompat.a libutil.la +tar_fuzz_LDADD = libtar.a libcompat.a check_PROGRAMS += test_mknode_simple test_mknode_slink test_mknode_reg check_PROGRAMS += test_mknode_dir test_gen_inode_table test_add_by_path diff --git a/tests/tar_fuzz.c b/tests/tar_fuzz.c index 1284bde..f342e38 100644 --- a/tests/tar_fuzz.c +++ b/tests/tar_fuzz.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_gnu.c b/tests/tar_gnu.c index 3df2855..de3af5b 100644 --- a/tests/tar_gnu.c +++ b/tests/tar_gnu.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_pax.c b/tests/tar_pax.c index 50a6bf9..8134591 100644 --- a/tests/tar_pax.c +++ b/tests/tar_pax.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_sparse_gnu.c b/tests/tar_sparse_gnu.c index 8776a09..9b28b17 100644 --- a/tests/tar_sparse_gnu.c +++ b/tests/tar_sparse_gnu.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_sparse_gnu1.c b/tests/tar_sparse_gnu1.c index 4a2c2b9..db812a0 100644 --- a/tests/tar_sparse_gnu1.c +++ b/tests/tar_sparse_gnu1.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_sparse_gnu2.c b/tests/tar_sparse_gnu2.c index 57508f8..4c8b860 100644 --- a/tests/tar_sparse_gnu2.c +++ b/tests/tar_sparse_gnu2.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_ustar.c b/tests/tar_ustar.c index d2b89f8..e015989 100644 --- a/tests/tar_ustar.c +++ b/tests/tar_ustar.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_xattr_bsd.c b/tests/tar_xattr_bsd.c index 39a73cc..dcaba1e 100644 --- a/tests/tar_xattr_bsd.c +++ b/tests/tar_xattr_bsd.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include diff --git a/tests/tar_xattr_schily.c b/tests/tar_xattr_schily.c index ba5bb2d..6cc31f5 100644 --- a/tests/tar_xattr_schily.c +++ b/tests/tar_xattr_schily.c @@ -6,7 +6,6 @@ */ #include "config.h" -#include "util/util.h" #include "tar.h" #include -- cgit v1.2.3