Nail down test suite to use the CQLParser script from ../../bin

and the cql-java.jar library from ../../lib

diff --git a/test/regression/Makefile b/test/regression/Makefile
index 3298539..683753b 100644 (file)
--- a/test/regression/Makefile
+++ b/test/regression/Makefile
@@ -1,10 +1,10 @@
-# $Id: Makefile,v 1.6 2002-11-20 22:50:45 mike Exp $
+# $Id: Makefile,v 1.7 2002-11-21 09:57:28 mike Exp $
 
 XMLCANONICALISER = cat
 # Change this to "./xmlpp.pl" if you want to check for equivalence
 
 test: sections/01/01.cql sections/01/01.xcql
-       ./runtests CQLParser $(XMLCANONICALISER)
+       ./runtests ../../bin/CQLParser $(XMLCANONICALISER)
 
 test-adam: sections/01/01.cql sections/01/01.xcql
        ./runtests ../../../srw/cql/cqlparse3 $(XMLCANONICALISER)
@@ -16,9 +16,9 @@ sections/01/01.cql: mktests queries.raw
        ./mktests queries.raw
 
 sections/01/01.xcql: mkanswers
-       ./mkanswers CQLParser
-# OR   ./mkanswers ../../srw/cql/cqlparse3
-# OR   ./mkanswers ../../rob/CQLParser.py
+       ./mkanswers ../../bin/CQLParser
+# OR   ./mkanswers ../../../srw/cql/cqlparse3
+# OR   ./mkanswers ../../../rob/CQLParser.py
 # Depending on which parser you want to use as your reference
 
 clean:

diff --git a/test/regression/README b/test/regression/README
index d7819d3..e416798 100644 (file)
--- a/test/regression/README
+++ b/test/regression/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.4 2002-11-20 22:50:45 mike Exp $
+$Id: README,v 1.5 2002-11-21 09:57:28 mike Exp $
 
 cql-java's regression-testing framework
 ---------------------------------------
@@ -40,7 +40,7 @@ against its results, do this:
        make refclean
        ./mktests queries.raw
        ./mkanswers CQLParser.py
-       ./runtests CQLParser ./xmlpp.pl
+       ./runtests ../../bin/CQLParser ./xmlpp.pl
 
 The second argument to ./runtests is the name of a program to use to
 normalise XML, so that the trusted output and the output being tested

diff --git a/test/regression/mkanswers b/test/regression/mkanswers
index 994bad4..ca6eefc 100755 (executable)
--- a/test/regression/mkanswers
+++ b/test/regression/mkanswers
@@ -1,10 +1,12 @@
 #!/usr/bin/perl -w
 
-# $Id: mkanswers,v 1.4 2002-11-20 23:10:17 mike Exp $
+# $Id: mkanswers,v 1.5 2002-11-21 09:57:28 mike Exp $
 
 use IO::File;
 use strict;
 
+$ENV{CLASSPATH} .= ":../../lib/cql-java.jar";
+
 if (@ARGV != 1) {
     print STDERR "Usage: $0 <trusted-CQL-compiler>\n";
     exit(1);

diff --git a/test/regression/runtests b/test/regression/runtests
index 5def86c..f1d462b 100755 (executable)
--- a/test/regression/runtests
+++ b/test/regression/runtests
@@ -1,16 +1,18 @@
 #!/usr/bin/perl -w
 
-# $Id: runtests,v 1.6 2002-11-20 23:10:17 mike Exp $
+# $Id: runtests,v 1.7 2002-11-21 09:57:28 mike Exp $
 
 use IO::File;
 use strict;
 
+$ENV{CLASSPATH} .= ":../../lib/cql-java.jar";
+
 if (@ARGV != 2) {
     print STDERR "Usage: $0 <CQL-compiler> <XML-normaliser>\n";
     exit(1);
 }
 my $compiler = $ARGV[0];
-my $norman = $ARGV[1];
+my $norman = $ARGV[1];         # name of XML normaliser program
 
 while (<sections/*>) {
     my $sdir = $_;