summaryrefslogtreecommitdiff
path: root/test/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'test/Makefile')
-rw-r--r--test/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/test/Makefile b/test/Makefile
index 3d50686..2d20d02 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,18 +1,17 @@
-testlib_files := lib/comparators.c;lib/list.c;lib/testassert.c
-testlib_files := $(testlib_files);lib/testobject.c;lib/utils.c
+testutils_files := testutils/comparators.c;testutils/list.c;testutils/domasserts.c
+testutils_files := $(testutils_files);testutils/utils.c;testutils/foreach.c;testutils/load.c
-TESTCFLAGS := $(TESTCFLAGS) -I$(CURDIR) -I$(CURDIR)/$(DIR)
+TESTCFLAGS := $(TESTCFLAGS) -I$(CURDIR) -I$(CURDIR)/testutils
-DIR_TEST_ITEMS := binding:binding.c;$(testlib_files) \
- test-list:test-list.c;$(testlib_files)
+DIR_TEST_ITEMS := $(testutils_files)
define add_xml_test
ifeq ($$(WANT_TEST),yes)
- $(DIR)xml/c/$1.c: $(DIR)xml/tests/$1.xml
+ $(DIR)xml/c/$1.c: $(DIR)xml/tests/$1.xml
$$(Q)$$(XSLTPROC) $$(XSLTPROCFLAGS) -o $$@ \
$(DIR)transform/test-to-c.xsl $$<
- DIR_TEST_ITEMS := $$(DIR_TEST_ITEMS) $1:xml/c/$1.c;$$(testlib_files)
+ DIR_TEST_ITEMS := $$(DIR_TEST_ITEMS) $1:xml/c/$1.c;$$(testlib_files)
endif
DISTCLEAN_ITEMS := $$(DISTCLEAN_ITEMS) $(DIR)xml/c/$1.c