Start reworking the test scripts.

diff --git a/Makefile.in b/Makefile.in
index 5443f6e..860c877 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@ CAMLP4FLAGS=@CAMLP4FLAGS@
 PPOPTSFLAGS= $($CAMLP4FLAGS:%=ppopt(%))
 OCAMLBUILDFLAGS=-j 0 -use-ocamlfind @OCAMLBUILDFLAGS@
 OCAMLBUILD=@OCAMLBUILD@
-
+PACKAGE = @PACKAGE_TARNAME@
 TARGETS=tatoo.native
 ifeq ($(BYTE), true)
        TARGETS += tatoo.byte
@@ -24,3 +24,14 @@ clean:
 
 distclean: clean
        @ rm -rf configure config.log config.status autom4te.cache Makefile
+
+%.summary:
+       target=$@ \
+       base=$* \
+       test=$${base#*.xml.} \
+       xml=$${base%.$$test} \
+       BIN=$(TEST) \
+       SPLIT=tools/split_path.native \
+       XMLDIFF=tools/xml_diff.native \
+       PACKAGE=$(PACKAGE) \
+       . tests/$${test}.sh

diff --git a/_tags b/_tags
index eb50bdc..7cca00f 100644 (file)
--- a/_tags
+++ b/_tags
@@ -2,5 +2,6 @@ true: syntax(camlp4o)
 true: package(ulex), package(unix) , package(expat) , package(camlp4.macro), package(bigarray), ppopt(-I), ppopt(include)
 
 <src>: include
+<tools>: include
 <src/xpath>: include
 <src/xpath/*.cmx>: for-pack(Xpath)

diff --git a/tests/test1.sh b/tests/test1.sh
index 2b02994..4cc2da4 100644 (file)
--- a/tests/test1.sh
+++ b/tests/test1.sh
@@ -6,7 +6,6 @@ echo "$MSG"
 cat ${xml}.queries | grep -v '^#' | while read q query; do
     echo -n "${xml} $q $query ... "
     REF=${xml}.results/"$q"_jaxp.xml
-    $REMAKE "$REF"
     OUTPUT=${xml}.results/"$q"_"$PACKAGE"_test1.xml
     LOG=${xml}.results/"$q"_"$PACKAGE"_test1.log
     "$BIN" -s -d ${xml} "$query" -o "$OUTPUT" > "$LOG" 2>&1