Cleanup: move source date epoch code back to libutil

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

3 files changed, 6 insertions, 78 deletions

diff --git a/tests/libfstree/Makemodule.am b/tests/libfstree/Makemodule.am
index 107a66c..2e22967 100644
--- a/tests/libfstree/Makemodule.am
+++ b/tests/libfstree/Makemodule.am
@@ -16,14 +16,14 @@ test_gen_inode_numbers_SOURCES = tests/libfstree/gen_inode_numbers.c
 test_gen_inode_numbers_LDADD = libfstree.a libutil.a libcompat.a
 
 test_add_by_path_SOURCES = tests/libfstree/add_by_path.c
-test_add_by_path_LDADD = libfstree.a libcompat.a
+test_add_by_path_LDADD = libfstree.a libutil.a libcompat.a
 
 test_get_path_SOURCES = tests/libfstree/get_path.c
-test_get_path_LDADD = libfstree.a libcompat.a
+test_get_path_LDADD = libfstree.a libutil.a libcompat.a
 
 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_sort_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 test_fstree_from_file_SOURCES = tests/libfstree/fstree_from_file.c
 test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS)
@@ -41,12 +41,7 @@ test_fstree_from_dir_LDADD = libfstree.a libutil.a libcompat.a
 
 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
-
-test_fstree_epoch_SOURCES = tests/libfstree/epoch.c
-test_fstree_epoch_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree
-test_fstree_epoch_SOURCES += lib/fstree/source_date_epoch.c
-test_fstree_epoch_LDADD = libcompat.a
+test_fstree_init_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 test_sort_file_SOURCES = tests/libfstree/sort_file.c
 test_sort_file_LDADD = libfstree.a libio.a libutil.a libcompat.a
@@ -58,8 +53,7 @@ FSTREE_TESTS = \
 	test_mknode_simple test_mknode_slink \
 	test_mknode_reg test_mknode_dir test_gen_inode_numbers \
 	test_add_by_path test_get_path test_fstree_sort test_fstree_from_file \
-	test_fstree_init \
-	test_fstree_from_dir test_fstree_glob1 test_fstree_epoch \
+	test_fstree_init test_fstree_from_dir test_fstree_glob1 \
 	test_sort_file
 
 if BUILD_TOOLS
diff --git a/tests/libfstree/epoch.c b/tests/libfstree/epoch.c
deleted file mode 100644
index ce7e120..0000000
--- a/tests/libfstree/epoch.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * epoch.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "internal.h"
-#include "util/test.h"
-
-#if defined(_WIN32) || defined(__WINDOWS__)
-static void setenv(const char *key, const char *value, int overwrite)
-{
-	char buffer[128];
-	(void)overwrite;
-
-	snprintf(buffer, sizeof(buffer) - 1, "%s=%s", key, value);
-	buffer[sizeof(buffer) - 1] = '\0';
-
-	_putenv(buffer);
-}
-
-static void unsetenv(const char *key)
-{
-	setenv(key, "", 0);
-}
-#endif
-
-int main(int argc, char **argv)
-{
-	sqfs_u32 ts;
-	(void)argc; (void)argv;
-
-	unsetenv("SOURCE_DATE_EPOCH");
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 0);
-
-	setenv("SOURCE_DATE_EPOCH", "1337", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 1337);
-
-	setenv("SOURCE_DATE_EPOCH", "0xCAFE", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 0);
-
-	setenv("SOURCE_DATE_EPOCH", "foobar", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 0);
-
-	setenv("SOURCE_DATE_EPOCH", "-12", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 0);
-
-	setenv("SOURCE_DATE_EPOCH", "12", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 12);
-
-	setenv("SOURCE_DATE_EPOCH", "4294967295", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 0xFFFFFFFF);
-
-	setenv("SOURCE_DATE_EPOCH", "4294967296", 1);
-	ts = get_source_date_epoch();
-	TEST_EQUAL_UI(ts, 0);
-
-	return EXIT_SUCCESS;
-}
diff --git a/tests/libfstree/fstree_init.c b/tests/libfstree/fstree_init.c
index 92bbc19..47c24ae 100644
--- a/tests/libfstree/fstree_init.c
+++ b/tests/libfstree/fstree_init.c
@@ -9,6 +9,7 @@
 #include "fstree.h"
 #include "internal.h"
 #include "util/test.h"
+#include "util/util.h"
 
 int main(int argc, char **argv)
 {