[MINOR] Test suite reorganization

tests/test.sh

@@ -43,43 +43,35 @@ echo -n "Tests on regtest: "
 $REGSCRIPT $REGCDFILE $REGLOGFILE $REGDIR/*.xsd
 echo " passed."
 
-# Test ocamlinterface
+# Test xsltmark
 
-echo "Tests on ocamlinterface: "
+SUCCESS=0
+TOTAL=0
+XSLTLOG=$ROOT/xsltmark/log
+GOODTESTS="$ROOT/xsltmark/identity.cd"
+EXTENDEDTESTS="$ROOT/xsltmark/xslbench2.cd $ROOT/xsltmark/xslbench4.cd"
 
-ocamlc -I $OCAMLDIR/misc -c $OCAMLDIR/misc/misc.mli
-$ROOT/../cduce -I $OCAMLDIR/misc --compile $OCAMLDIR/misc/consts.cd
-$ROOT/../cduce -I $OCAMLDIR/misc --compile $OCAMLDIR/misc/misc.cd
-$ROOT/../cduce -I $OCAMLDIR/misc --mlstub $OCAMLDIR/misc/consts.cdo > $OCAMLDIR/misc/consts.ml
-$ROOT/../cduce -I $OCAMLDIR/misc --mlstub $OCAMLDIR/misc/misc.cdo > $OCAMLDIR/misc/misc.ml
-ocamlfind ocamlc -I $OCAMLDIR/misc -g -package cduce,oUnit -linkpkg -o $OCAMLDIR/misc/misc $OCAMLDIR/misc/consts.ml $OCAMLDIR/misc/misc.ml $OCAMLDIR/misc/misctest.ml
-$OCAMLDIR/misc/misc 2> /dev/null
+echo -n "Tests on xsltmark: "
 
-ocamlc -I $OCAMLDIR/eval -c $OCAMLDIR/eval/eval.mli
-$ROOT/../cduce -I $OCAMLDIR/eval --compile $OCAMLDIR/eval/eval.cd -I $OCAML_TOPLEVEL_PATH/../cduce
-$ROOT/../cduce -I $OCAMLDIR/eval --mlstub $OCAMLDIR/eval/eval.cdo > $OCAMLDIR/eval/eval.ml
-ocamlfind ocamlc -I $OCAMLDIR/eval -package cduce,oUnit -linkpkg -o $OCAMLDIR/eval/eval $OCAMLDIR/eval/eval.ml $OCAMLDIR/eval/evaltest.ml
-$OCAMLDIR/eval/eval
+echo > $XSLTLOG
 
-ocamlc -I $OCAMLDIR/cdnum -c $OCAMLDIR/cdnum/cdnum.mli
-$ROOT/../cduce -I $OCAMLDIR/cdnum --compile $OCAMLDIR/cdnum/cdnum.cd -I `ocamlfind query num`
-$ROOT/../cduce -I $OCAMLDIR/cdnum --mlstub $OCAMLDIR/cdnum/cdnum.cdo > $OCAMLDIR/cdnum/cdnum.ml
-ocamlfind ocamlc -I $OCAMLDIR/cdnum -package cduce,num,oUnit -linkpkg -o $OCAMLDIR/cdnum/cdnum $OCAMLDIR/cdnum/cdnum.ml $OCAMLDIR/cdnum/cdnumtest.ml
-$OCAMLDIR/cdnum/cdnum
+if test $EXTENDED = "true"; then GOODTESTS="$GOODTESTS $EXTENDEDTESTS"; fi
 
-if test $EXTENDED = "true"; then
-    ocamlc -I $OCAMLDIR/cdsdl -c -I `ocamlfind query sdl` $OCAMLDIR/cdsdl/cdsdl.mli
-    $ROOT/../cduce -I $OCAMLDIR/cdsdl --compile -I `ocamlfind query sdl` $OCAMLDIR/cdsdl/cdsdl.cd
-    $ROOT/../cduce -I $OCAMLDIR/cdsdl --mlstub -I `ocamlfind query sdl` $OCAMLDIR/cdsdl/cdsdl.cdo > $OCAMLDIR/cdsdl/cdsdl.ml
-    ocamlfind ocamlc -I $OCAMLDIR/cdsdl -package cduce,sdl,oUnit -linkpkg -o $OCAMLDIR/cdsdl/cdsdl $OCAMLDIR/cdsdl/cdsdl.ml $OCAMLDIR/cdsdl/cdsdltest.ml
-    $OCAMLDIR/cdsdl/cdsdl
+for i in db100.xml db10.xml; do
+    TOTAL=$(($TOTAL+1))
+    echo "==============dbonerow.cd --arg $i===============" >> $XSLTLOG;
+    $ROOT/../cduce $ROOT/xsltmark/dbonerow.cd --arg $ROOT/xsltmark/testcases/$i > /dev/null 2>> $XSLTLOG;
+    if test $? -eq 0; then SUCCESS=$(($SUCCESS+1)); fi
+done
 
-    ocamlc -I $OCAMLDIR/latypes -c $OCAMLDIR/latypes/latypes.mli
-    $ROOT/../cduce -I $OCAMLDIR/latypes --compile $OCAMLDIR/latypes/latypes.cd
-    $ROOT/../cduce -I $OCAMLDIR/latypes --mlstub $OCAMLDIR/latypes/latypes.cdo > $OCAMLDIR/latypes/latypes2.ml
-    ocamlfind ocamlc -I $OCAMLDIR/latypes -package cduce,num,oUnit -linkpkg -o $OCAMLDIR/latypes/latypes $OCAMLDIR/latypes/latypes.ml $OCAMLDIR/latypes/latypes2.ml $OCAMLDIR/latypes/latypestest.ml
-    $OCAMLDIR/latypes/latypes
-fi
+for i in $GOODTESTS; do
+    TOTAL=$(($TOTAL+1))
+    echo "==============`echo $i | rev | cut -d "/" -f -1 | rev`===============" >> $XSLTLOG;
+    $ROOT/../cduce $i > /dev/null 2>> $XSLTLOG;
+    if test $? -eq 0; then SUCCESS=$(($SUCCESS+1)); fi
+done
+
+echo "$SUCCESS / $TOTAL passed."
 
 # Test misc
 
@@ -120,32 +112,40 @@ done
 
 echo "$SUCCESS / $TOTAL passed."
 
-# Test xsltmark
-
-SUCCESS=0
-TOTAL=0
-XSLTLOG=$ROOT/xsltmark/log
-GOODTESTS="$ROOT/xsltmark/identity.cd"
-EXTENDEDTESTS="$ROOT/xsltmark/xslbench2.cd $ROOT/xsltmark/xslbench4.cd"
+# Test ocamlinterface
 
-echo -n "Tests on xsltmark: "
+echo "Tests on ocamlinterface: "
 
-echo > $XSLTLOG
+ocamlc -I $OCAMLDIR/misc -c $OCAMLDIR/misc/misc.mli
+$ROOT/../cduce -I $OCAMLDIR/misc --compile $OCAMLDIR/misc/consts.cd
+$ROOT/../cduce -I $OCAMLDIR/misc --compile $OCAMLDIR/misc/misc.cd
+$ROOT/../cduce -I $OCAMLDIR/misc --mlstub $OCAMLDIR/misc/consts.cdo > $OCAMLDIR/misc/consts.ml
+$ROOT/../cduce -I $OCAMLDIR/misc --mlstub $OCAMLDIR/misc/misc.cdo > $OCAMLDIR/misc/misc.ml
+ocamlfind ocamlc -I $OCAMLDIR/misc -g -package cduce,oUnit -linkpkg -o $OCAMLDIR/misc/misc $OCAMLDIR/misc/consts.ml $OCAMLDIR/misc/misc.ml $OCAMLDIR/misc/misctest.ml
+$OCAMLDIR/misc/misc 2> /dev/null
 
-if test $EXTENDED = "true"; then GOODTESTS="$GOODTESTS $EXTENDEDTESTS"; fi
+ocamlc -I $OCAMLDIR/eval -c $OCAMLDIR/eval/eval.mli
+$ROOT/../cduce -I $OCAMLDIR/eval --compile $OCAMLDIR/eval/eval.cd -I $OCAML_TOPLEVEL_PATH/../cduce
+$ROOT/../cduce -I $OCAMLDIR/eval --mlstub $OCAMLDIR/eval/eval.cdo > $OCAMLDIR/eval/eval.ml
+ocamlfind ocamlc -I $OCAMLDIR/eval -package cduce,oUnit -linkpkg -o $OCAMLDIR/eval/eval $OCAMLDIR/eval/eval.ml $OCAMLDIR/eval/evaltest.ml
+$OCAMLDIR/eval/eval
 
-for i in db100.xml db10.xml; do
-    TOTAL=$(($TOTAL+1))
-    echo "==============dbonerow.cd --arg $i===============" >> $XSLTLOG;
-    $ROOT/../cduce $ROOT/xsltmark/dbonerow.cd --arg $ROOT/xsltmark/testcases/$i > /dev/null 2>> $XSLTLOG;
-    if test $? -eq 0; then SUCCESS=$(($SUCCESS+1)); fi
-done
+ocamlc -I $OCAMLDIR/cdnum -c $OCAMLDIR/cdnum/cdnum.mli
+$ROOT/../cduce -I $OCAMLDIR/cdnum --compile $OCAMLDIR/cdnum/cdnum.cd -I `ocamlfind query num`
+$ROOT/../cduce -I $OCAMLDIR/cdnum --mlstub $OCAMLDIR/cdnum/cdnum.cdo > $OCAMLDIR/cdnum/cdnum.ml
+ocamlfind ocamlc -I $OCAMLDIR/cdnum -package cduce,num,oUnit -linkpkg -o $OCAMLDIR/cdnum/cdnum $OCAMLDIR/cdnum/cdnum.ml $OCAMLDIR/cdnum/cdnumtest.ml
+$OCAMLDIR/cdnum/cdnum
 
-for i in $GOODTESTS; do
-    TOTAL=$(($TOTAL+1))
-    echo "==============`echo $i | rev | cut -d "/" -f -1 | rev`===============" >> $XSLTLOG;
-    $ROOT/../cduce $i > /dev/null 2>> $XSLTLOG;
-    if test $? -eq 0; then SUCCESS=$(($SUCCESS+1)); fi
-done
+if test $EXTENDED = "true"; then
+    ocamlc -I $OCAMLDIR/cdsdl -c -I `ocamlfind query sdl` $OCAMLDIR/cdsdl/cdsdl.mli
+    $ROOT/../cduce -I $OCAMLDIR/cdsdl --compile -I `ocamlfind query sdl` $OCAMLDIR/cdsdl/cdsdl.cd
+    $ROOT/../cduce -I $OCAMLDIR/cdsdl --mlstub -I `ocamlfind query sdl` $OCAMLDIR/cdsdl/cdsdl.cdo > $OCAMLDIR/cdsdl/cdsdl.ml
+    ocamlfind ocamlc -I $OCAMLDIR/cdsdl -package cduce,sdl,oUnit -linkpkg -o $OCAMLDIR/cdsdl/cdsdl $OCAMLDIR/cdsdl/cdsdl.ml $OCAMLDIR/cdsdl/cdsdltest.ml
+    $OCAMLDIR/cdsdl/cdsdl
 
-echo "$SUCCESS / $TOTAL passed."
+    ocamlc -I $OCAMLDIR/latypes -c $OCAMLDIR/latypes/latypes.mli
+    $ROOT/../cduce -I $OCAMLDIR/latypes --compile $OCAMLDIR/latypes/latypes.cd
+    $ROOT/../cduce -I $OCAMLDIR/latypes --mlstub $OCAMLDIR/latypes/latypes.cdo > $OCAMLDIR/latypes/latypes2.ml
+    ocamlfind ocamlc -I $OCAMLDIR/latypes -package cduce,num,oUnit -linkpkg -o $OCAMLDIR/latypes/latypes $OCAMLDIR/latypes/latypes.ml $OCAMLDIR/latypes/latypes2.ml $OCAMLDIR/latypes/latypestest.ml
+    $OCAMLDIR/latypes/latypes
+fi