[Flexml-commits] flexml/examples Makefile,1.4,1.5

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29760/examples

Modified Files:
	Makefile 
Log Message:
Make more clear which test passed and which failed. Do test against the version in the current dir, not the installed one

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/examples/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	18 Mar 2005 22:10:52 -0000	1.4
+++ Makefile	21 Mar 2006 13:11:27 -0000	1.5
@@ -24,6 +24,10 @@
 
 include ../Makefile.defs
 
+# Test the version in this dir, not the installed one
+SKEL=../skel
+ACT=../flexml-act
+
 SAMPS =	my.dtd my-show.act my-joke.xml my-joke2.xml my-joke3.xml \
 	tricky.dtd tricky.act tricky.xml \
 	test.html
@@ -55,7 +59,7 @@
 
 
 # DEFAULT RULES.
-FLEXML_PROG = ../$(FLEXML)
+FLEXML_PROG = ../$(FLEXML) -s$(SKEL) -T$(ACT)
 
 # Generate C source from flex scanner.
 %.c: 		%.l
@@ -89,9 +93,10 @@
 my-show:	my-show.o my.o
 
 test::		my-show
-	./my-show <my-joke.xml && echo OK
-	./my-show <my-joke2.xml && echo OK
-	./my-show <my-joke3.xml || echo OK
+	@echo "XXXXX Test: LINK processor with application"
+	if ./my-show <my-joke.xml  ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi
+	if ./my-show <my-joke2.xml ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi
+	if ./my-show <my-joke3.xml ; then echo "TEST FAILED"; else echo "TEST PASSED"; fi
 
 clean::; $(RM) my.c my-show my-show.c my-dummy my-dummy.c
 
@@ -103,7 +108,8 @@
 tricky:		tricky.o
 
 test::		tricky
-	./tricky <tricky.xml
+	@echo "XXXXX Test: COMPILE processor with application"
+	if ./tricky <tricky.xml ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi
 
 clean::; $(RM) tricky.[lco] tricky
 
@@ -113,7 +119,7 @@
 	wget 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
 
 xhtml1-transitional.l xhtml1-transitional.h: xhtml1-transitional.dtd
-	../$(FLEXML) $(FLEXDEBUG) -rhtml \
+	$(FLEXML_PROG) -rhtml \
 		-p "-//IETF//DTD XHTML 1.0 Transitional//EN" \
 		-u "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" \
 		xhtml1-transitional.dtd
@@ -128,8 +134,9 @@
 xhtml-href:	xhtml-href.o xhtml1-transitional.o
 
 test::		xhtml-href FleXML.xml
-	./xhtml-href <test.html
-	./xhtml-href < FleXML.xml
+	@echo "XXXXX Test: application to print XHTML <a href=...> values"
+	if ./xhtml-href <test.html   ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi
+	if ./xhtml-href < FleXML.xml ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi
 
 clean::; $(RM) xhtml1-*.dtd xhtml1-*.[lhco] xhtml-href.[co] xhtml-href
 
@@ -137,6 +144,7 @@
 
 clean::; @echo "Done cleaning."
 test::;	@echo "Done testing."
+test:: clean
 
 .PHONEY : echov