X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fregression%2FMakefile;h=81a3b278d81f4a7a511150b05477719ad95befc6;hb=4e874df732f94bfee7f0e737b74143b191cde33f;hp=b8a862c836f4da3cab4c66d60d73cbfff27a361f;hpb=d6698dbfb468b564d41a6cf3bea31c6d71912175;p=cql-java-moved-to-github.git

diff --git a/test/regression/Makefile b/test/regression/Makefile
index b8a862c..81a3b27 100644
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -1,32 +1,31 @@
-# $Id: Makefile,v 1.5 2002-11-20 17:55:46 mike Exp $
+# $Id: Makefile,v 1.9 2002-11-28 11:56:55 mike Exp $
 
-XMLCANONICALISER = ./xmlpp.pl
-# Change this to "cat" if you want to check byte-for-byte identicality
+XMLCANONICALISER = cat
+# Change this to "./xmlpp.pl" if you want to check for equivalence
 
-test:
-	./runtests CQLParser $(XMLCANONICALISER)
+test: sections/01/01.cql sections/01/01.xcql
+	./runtests ../../bin/CQLParser $(XMLCANONICALISER)
 
-test-adam: sections/01/01.xcql
-	./runtests ../../../srw/cql/cqlparse3 $(XMLCANONICALISER)
+test-adam: sections/01/01.cql sections/01/01.xcql
+	./runtests ../../../srw/cql/cql2xcql $(XMLCANONICALISER)
 
-test-rob: sections/01/01.xcql
+test-rob: sections/01/01.cql sections/01/01.xcql
 	./runtests ../../../rob/CQLParser.py $(XMLCANONICALISER)
 
-reference: sections/01/01.xcql
+sections/01/01.cql: mktests queries.raw
+	./mktests queries.raw
 
-sections/01/01.xcql: sections
-	./mkanswers CQLParser
-# OR	./mkanswers ../../srw/cql/cqlparse3
-# OR	./mkanswers ../../rob/CQLParser.py
+sections/01/01.xcql: mkanswers
+	./mkanswers ../../bin/CQLParser
+# OR	./mkanswers ../../../srw/cql/cql2xcql
+# OR	./mkanswers ../../../rob/CQLParser.py
 # Depending on which parser you want to use as your reference
 
-sections: mktests queries.raw
-	rm -rf sections
-	./mktests queries.raw
-
 clean:
 	@echo "Nothing to do to 'make clean'"
 
-reference-clean:
-	rm -rf sections
+distclean:
+	find sections . -name '*.cql' -exec rm \{\} \;
 
+refclean:
+	find sections . -name '*.xcql' -exec rm \{\} \;