aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/gensquashfs/Makemodule.am48
-rw-r--r--tests/gensquashfs/fstree1.txt (renamed from tests/libfstree/fstree1.txt)0
-rw-r--r--tests/gensquashfs/fstree_from_dir.c (renamed from tests/libfstree/fstree_from_dir.c)2
-rw-r--r--tests/gensquashfs/fstree_from_file.c (renamed from tests/libfstree/fstree_from_file.c)2
-rw-r--r--tests/gensquashfs/fstree_fuzz.c (renamed from tests/libfstree/fstree_fuzz.c)2
-rw-r--r--tests/gensquashfs/fstree_glob1.c (renamed from tests/libfstree/fstree_glob1.c)2
-rw-r--r--tests/gensquashfs/fstree_glob1.txt (renamed from tests/libfstree/fstree_glob1.txt)0
-rw-r--r--tests/gensquashfs/fstree_glob2.txt (renamed from tests/libfstree/fstree_glob2.txt)0
-rw-r--r--tests/gensquashfs/fstree_glob3.txt (renamed from tests/libfstree/fstree_glob3.txt)0
-rw-r--r--tests/gensquashfs/sort_file.c (renamed from tests/libfstree/sort_file.c)2
-rw-r--r--tests/libfstree/Makemodule.am31
11 files changed, 52 insertions, 37 deletions
diff --git a/tests/gensquashfs/Makemodule.am b/tests/gensquashfs/Makemodule.am
index a20e6ef..c1ab164 100644
--- a/tests/gensquashfs/Makemodule.am
+++ b/tests/gensquashfs/Makemodule.am
@@ -8,13 +8,55 @@ test_filemap_xattr_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/xattr1.txt
test_filemap_xattr_LDADD = libsquashfs.la libfstree.a libutil.a
test_filemap_xattr_LDADD += libio.a libcompat.a
+test_fstree_from_file_SOURCES = tests/gensquashfs/fstree_from_file.c \
+ bin/gensquashfs/fstree_from_file.c \
+ bin/gensquashfs/fstree_from_dir.c \
+ bin/gensquashfs/mkfs.h
+test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+test_fstree_from_file_CPPFLAGS += -DTESTPATH=$(GENDATADIR)/fstree1.txt
+test_fstree_from_file_LDADD = libfstree.a libio.a libutil.a libcompat.a
+
+test_fstree_glob1_SOURCES = tests/gensquashfs/fstree_glob1.c \
+ bin/gensquashfs/fstree_from_file.c \
+ bin/gensquashfs/fstree_from_dir.c \
+ bin/gensquashfs/mkfs.h
+test_fstree_glob1_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+test_fstree_glob1_CPPFLAGS += -DTESTPATH=$(GENDATADIR)
+test_fstree_glob1_LDADD = libfstree.a libio.a libutil.a libcompat.a
+
+test_fstree_from_dir_SOURCES = tests/gensquashfs/fstree_from_dir.c \
+ bin/gensquashfs/fstree_from_dir.c \
+ bin/gensquashfs/mkfs.h
+test_fstree_from_dir_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+test_fstree_from_dir_CPPFLAGS += -DTESTPATH=$(top_srcdir)/tests/libtar/data
+test_fstree_from_dir_LDADD = libfstree.a libutil.a libcompat.a
+
+test_sort_file_SOURCES = tests/gensquashfs/sort_file.c \
+ bin/gensquashfs/fstree_from_file.c \
+ bin/gensquashfs/fstree_from_dir.c \
+ bin/gensquashfs/sort_by_file.c \
+ bin/gensquashfs/mkfs.h
+test_sort_file_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+test_sort_file_LDADD = libfstree.a libio.a libutil.a libcompat.a
+
+fstree_fuzz_SOURCES = tests/gensquashfs/fstree_fuzz.c \
+ bin/gensquashfs/fstree_from_file.c \
+ bin/gensquashfs/fstree_from_dir.c \
+ bin/gensquashfs/mkfs.h
+fstree_fuzz_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/bin/gensquashfs
+fstree_fuzz_LDADD = libfstree.a libio.a libutil.a libcompat.a
+
GENSQUASHFS_TESTS = \
- test_filemap_xattr
+ test_filemap_xattr test_fstree_from_file test_fstree_from_dir \
+ test_fstree_glob1 test_sort_file
if BUILD_TOOLS
+noinst_PROGRAMS += fstree_fuzz
+
check_PROGRAMS += $(GENSQUASHFS_TESTS)
TESTS += $(GENSQUASHFS_TESTS)
endif
-EXTRA_DIST += $(GENDATADIR)/xattr1.txt
-
+EXTRA_DIST += $(GENDATADIR)/xattr1.txt $(GENDATADIR)/fstree1.txt
+EXTRA_DIST += $(GENDATADIR)/fstree_glob1.txt $(GENDATADIR)/fstree_glob2.txt
+EXTRA_DIST += $(GENDATADIR)/fstree_glob3.txt
diff --git a/tests/libfstree/fstree1.txt b/tests/gensquashfs/fstree1.txt
index 95ee469..95ee469 100644
--- a/tests/libfstree/fstree1.txt
+++ b/tests/gensquashfs/fstree1.txt
diff --git a/tests/libfstree/fstree_from_dir.c b/tests/gensquashfs/fstree_from_dir.c
index 438e357..2799bf3 100644
--- a/tests/libfstree/fstree_from_dir.c
+++ b/tests/gensquashfs/fstree_from_dir.c
@@ -6,8 +6,8 @@
*/
#include "config.h"
-#include "fstree.h"
#include "util/test.h"
+#include "mkfs.h"
static void check_hierarchy(tree_node_t *root, bool recursive)
{
diff --git a/tests/libfstree/fstree_from_file.c b/tests/gensquashfs/fstree_from_file.c
index 184c011..2a9ba1e 100644
--- a/tests/libfstree/fstree_from_file.c
+++ b/tests/gensquashfs/fstree_from_file.c
@@ -6,8 +6,8 @@
*/
#include "config.h"
-#include "fstree.h"
#include "util/test.h"
+#include "mkfs.h"
int main(int argc, char **argv)
{
diff --git a/tests/libfstree/fstree_fuzz.c b/tests/gensquashfs/fstree_fuzz.c
index ebc8c45..4fbb72b 100644
--- a/tests/libfstree/fstree_fuzz.c
+++ b/tests/gensquashfs/fstree_fuzz.c
@@ -6,7 +6,7 @@
*/
#include "config.h"
-#include "fstree.h"
+#include "mkfs.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/tests/libfstree/fstree_glob1.c b/tests/gensquashfs/fstree_glob1.c
index 3aff21a..fbcbf91 100644
--- a/tests/libfstree/fstree_glob1.c
+++ b/tests/gensquashfs/fstree_glob1.c
@@ -6,8 +6,8 @@
*/
#include "config.h"
-#include "fstree.h"
#include "util/test.h"
+#include "mkfs.h"
static void check_hierarchy(tree_node_t *root, bool subdir, bool recursive)
{
diff --git a/tests/libfstree/fstree_glob1.txt b/tests/gensquashfs/fstree_glob1.txt
index b1df979..b1df979 100644
--- a/tests/libfstree/fstree_glob1.txt
+++ b/tests/gensquashfs/fstree_glob1.txt
diff --git a/tests/libfstree/fstree_glob2.txt b/tests/gensquashfs/fstree_glob2.txt
index 3c8019b..3c8019b 100644
--- a/tests/libfstree/fstree_glob2.txt
+++ b/tests/gensquashfs/fstree_glob2.txt
diff --git a/tests/libfstree/fstree_glob3.txt b/tests/gensquashfs/fstree_glob3.txt
index 35090e4..35090e4 100644
--- a/tests/libfstree/fstree_glob3.txt
+++ b/tests/gensquashfs/fstree_glob3.txt
diff --git a/tests/libfstree/sort_file.c b/tests/gensquashfs/sort_file.c
index 78d1606..951328e 100644
--- a/tests/libfstree/sort_file.c
+++ b/tests/gensquashfs/sort_file.c
@@ -7,9 +7,9 @@
#include "config.h"
#include "sqfs/block.h"
-#include "fstree.h"
#include "util/test.h"
#include "util/util.h"
+#include "mkfs.h"
static const char *listing =
"dir /bin 0755 0 0\n"
diff --git a/tests/libfstree/Makemodule.am b/tests/libfstree/Makemodule.am
index 7826cf8..5ae44a6 100644
--- a/tests/libfstree/Makemodule.am
+++ b/tests/libfstree/Makemodule.am
@@ -25,43 +25,16 @@ 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 libutil.a libcompat.a
-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 libutil.a libcompat.a
-
-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 libutil.a libcompat.a
-
-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 libutil.a libcompat.a
-
test_fstree_init_SOURCES = tests/libfstree/fstree_init.c
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
-
-fstree_fuzz_SOURCES = tests/libfstree/fstree_fuzz.c
-fstree_fuzz_LDADD = libfstree.a libio.a libutil.a libcompat.a
-
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_sort_file
+ test_add_by_path test_get_path test_fstree_sort \
+ test_fstree_init
if BUILD_TOOLS
check_PROGRAMS += $(FSTREE_TESTS)
-noinst_PROGRAMS += fstree_fuzz
-
TESTS += $(FSTREE_TESTS)
endif
-
-EXTRA_DIST += $(FSTDATADIR)/fstree1.txt
-EXTRA_DIST += $(FSTDATADIR)/fstree_glob1.txt $(FSTDATADIR)/fstree_glob2.txt
-EXTRA_DIST += $(FSTDATADIR)/fstree_glob3.txt
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-23 02:40:07 +0000