projects
/
cql-java-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8a7980a
)
Tweaks to test suite. I think it's ready for serious use now.
author
mike
<mike>
Wed, 20 Nov 2002 17:55:46 +0000
(17:55 +0000)
committer
mike
<mike>
Wed, 20 Nov 2002 17:55:46 +0000
(17:55 +0000)
test/regression/Makefile
patch
|
blob
|
history
test/regression/runtests
patch
|
blob
|
history
diff --git
a/test/regression/Makefile
b/test/regression/Makefile
index
73a705e
..
b8a862c
100644
(file)
--- a/
test/regression/Makefile
+++ b/
test/regression/Makefile
@@
-1,4
+1,4
@@
-# $Id: Makefile,v 1.4 2002-11-20 01:15:15 mike Exp $
+# $Id: Makefile,v 1.5 2002-11-20 17:55:46 mike Exp $
XMLCANONICALISER = ./xmlpp.pl
# Change this to "cat" if you want to check byte-for-byte identicality
XMLCANONICALISER = ./xmlpp.pl
# Change this to "cat" if you want to check byte-for-byte identicality
@@
-27,6
+27,6
@@
sections: mktests queries.raw
clean:
@echo "Nothing to do to 'make clean'"
clean:
@echo "Nothing to do to 'make clean'"
-totally-clean:
+reference-clean:
rm -rf sections
rm -rf sections
diff --git
a/test/regression/runtests
b/test/regression/runtests
index
32e9707
..
6703e37
100755
(executable)
--- a/
test/regression/runtests
+++ b/
test/regression/runtests
@@
-1,6
+1,6
@@
#!/usr/bin/perl -w
#!/usr/bin/perl -w
-# $Id: runtests,v 1.4 2002-11-20 01:15:15 mike Exp $
+# $Id: runtests,v 1.5 2002-11-20 17:55:46 mike Exp $
use IO::File;
use strict;
use IO::File;
use strict;
@@
-23,12
+23,14
@@
while (<sections/*>) {
my $query = read_file($qfile);
my $afile = $qfile;
$afile =~ s/\.cql$/.xcql/;
my $query = read_file($qfile);
my $afile = $qfile;
$afile =~ s/\.cql$/.xcql/;
- print " query $_ - $query\n";
+ print " query $_ - $query ";
my $correct = read_file("$norman < $afile |");
my $tested = read_file("$compiler < $qfile | $norman |")
my $correct = read_file("$norman < $afile |");
my $tested = read_file("$compiler < $qfile | $norman |")
- or warn "test compiler exited non-zero";
- if ($tested ne $correct) {
- print " *** different XCQL output\n";
+ or print "\n *** test compiler exited non-zero\n";
+ if ($tested eq $correct) {
+ print "OK\n";
+ } else {
+ print "\n *** different XCQL output\n";
print "=== correct ===\n$correct";
print "=== tested ===\n$tested";
}
print "=== correct ===\n$correct";
print "=== tested ===\n$tested";
}