summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2007-07-21 18:55:40 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2007-07-21 18:55:40 +0000
commitc06d4443333f414197dbef192e86993b21983ffe (patch)
tree50a62768e707bd86df4ec76d1d3e5c6836c0d90f
parentd612f3b4c5f0370fb5cfd05ffb79e0165e2a8761 (diff)
downloadlibdom-c06d4443333f414197dbef192e86993b21983ffe.tar.gz
libdom-c06d4443333f414197dbef192e86993b21983ffe.tar.bz2
Silence GCC/LD command lines when building test cases.
Improve structure of xml-based testsuite svn path=/trunk/dom/; revision=3452
-rw-r--r--test/Makefile21
-rw-r--r--test/xml/tests/documentcreateelement.xml (renamed from test/xml/documentcreateelement.xml)0
-rw-r--r--test/xml/tests/documentgetdoctype.xml (renamed from test/xml/documentgetdoctype.xml)0
-rw-r--r--test/xml/tests/dom1.dtd (renamed from test/xml/dom1.dtd)0
4 files changed, 11 insertions, 10 deletions
diff --git a/test/Makefile b/test/Makefile
index f2cc1d3..82593de 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -29,13 +29,13 @@ RELEASE =
DEBUG =
# Transformer input
-XMLFILES = $(wildcard xml/*.xml)
+XMLFILES = $(wildcard xml/tests/*.xml)
# Transformer output
-CFILES = $(XMLFILES:.xml=.c)
+CFILES = $(addprefix xml/c/, $(notdir $(XMLFILES:.xml=.c)))
# Objects
-OBJS = $(CFILES:.c=)
+OBJS = $(addprefix xml/bin/, $(notdir $(XMLFILES:.xml=)))
.PHONY: clean debug export release setup test
@@ -46,15 +46,16 @@ debug:
clean:
ifneq (${OBJS}, )
- -@${RM} ${RMFLAGS} $(CFILES)
- -@${RM} ${RMFLAGS} $(CFILES:.c=.o)
- -@${RM} ${RMFLAGS} $(addsuffix ${EXEEXT}, $(OBJS))
+ -@${RM} ${RMFLAGS} -r xml/c/
+ -@${RM} ${RMFLAGS} -r xml/bin/
endif
distclean:
-@${RM} ${RMFLAGS} log
setup:
+ @${MKDIR} ${MKDIRFLAGS} $(CURDIR)/xml/c
+ @${MKDIR} ${MKDIRFLAGS} $(CURDIR)/xml/bin
export:
@@ -64,11 +65,11 @@ test: $(OBJS)
transform: $(CFILES)
# Pattern rules
-%: %.c
+xml/bin/%: xml/c/%.c
@${ECHO} ${ECHOFLAGS} "==> $<"
- ${CC} -c -g ${CFLAGS} -o $@.o $<
- ${LD} -g -o $@ $@.o ${LDFLAGS} -ldom-libxml-debug -ldom-debug
+ @${CC} -c -g ${CFLAGS} -o $@.o $<
+ @${LD} -g -o $@ $@.o ${LDFLAGS} -ldom-libxml-debug -ldom-debug
@${RM} ${RMFLAGS} $@.o
-%.c: %.xml
+xml/c/%.c: xml/tests/%.xml
@${XSLT} ${XSLTFLAGS} -o $@ transform/test-to-c.xsl $<
diff --git a/test/xml/documentcreateelement.xml b/test/xml/tests/documentcreateelement.xml
index 9139ad2..9139ad2 100644
--- a/test/xml/documentcreateelement.xml
+++ b/test/xml/tests/documentcreateelement.xml
diff --git a/test/xml/documentgetdoctype.xml b/test/xml/tests/documentgetdoctype.xml
index 655d6f1..655d6f1 100644
--- a/test/xml/documentgetdoctype.xml
+++ b/test/xml/tests/documentgetdoctype.xml
diff --git a/test/xml/dom1.dtd b/test/xml/tests/dom1.dtd
index ad7492d..ad7492d 100644
--- a/test/xml/dom1.dtd
+++ b/test/xml/tests/dom1.dtd