retesting

KNowledgeOnWebScale · Nov 8, 2023 · 0bd5632 · 0bd5632
1 parent cc86a6f
commit 0bd5632
Show file tree

Hide file tree

Showing 72 changed files with 10 additions and 152 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.2.0
+5.2.1
diff --git a/rdfsurfaces/beetle/beetle.s → examples/beetle.pl b/rdfsurfaces/beetle/beetle.s → examples/beetle.pl
diff --git a/rdfsurfaces/complex/complex.s → examples/complex.pl b/rdfsurfaces/complex/complex.s → examples/complex.pl
diff --git a/...ces/contradiction/contradiction-builtin.s → examples/contradiction-builtin.pl b/...ces/contradiction/contradiction-builtin.s → examples/contradiction-builtin.pl
diff --git a/rdfsurfaces/contradiction/contradiction.s → examples/contradiction.pl b/rdfsurfaces/contradiction/contradiction.s → examples/contradiction.pl
diff --git a/rdfsurfaces/contradiction/contradiction5.s → examples/contradiction5.pl b/rdfsurfaces/contradiction/contradiction5.s → examples/contradiction5.pl
diff --git a/rdfsurfaces/dishes/dishes.s → examples/dishes.pl b/rdfsurfaces/dishes/dishes.s → examples/dishes.pl
diff --git a/rdfsurfaces/edt/edt.s → examples/edt.pl b/rdfsurfaces/edt/edt.s → examples/edt.pl
diff --git a/rdfsurfaces/fibonacci/fibonacci.s → examples/fibonacci.pl b/rdfsurfaces/fibonacci/fibonacci.s → examples/fibonacci.pl
diff --git a/rdfsurfaces/graph/graph.s → examples/graph.pl b/rdfsurfaces/graph/graph.s → examples/graph.pl
diff --git a/rdfsurfaces/lubm/lubm.s → examples/lubm.pl b/rdfsurfaces/lubm/lubm.s → examples/lubm.pl
diff --git a/rdfsurfaces/beetle/beetle-output.s → examples/out/beetle.pl.out b/rdfsurfaces/beetle/beetle-output.s → examples/out/beetle.pl.out
diff --git a/rdfsurfaces/complex/complex-output.s → examples/out/complex.pl.out b/rdfsurfaces/complex/complex-output.s → examples/out/complex.pl.out
diff --git a/...tradiction/contradiction-builtin-output.s → examples/out/contradiction-builtin.pl.out b/...tradiction/contradiction-builtin-output.s → examples/out/contradiction-builtin.pl.out
diff --git a/...aces/contradiction/contradiction-output.s → examples/out/contradiction.pl.out b/...aces/contradiction/contradiction-output.s → examples/out/contradiction.pl.out
diff --git a/...ces/contradiction/contradiction5-output.s → examples/out/contradiction5.pl.out b/...ces/contradiction/contradiction5-output.s → examples/out/contradiction5.pl.out
diff --git a/rdfsurfaces/dishes/dishes-output.s → examples/out/dishes.pl.out b/rdfsurfaces/dishes/dishes-output.s → examples/out/dishes.pl.out
diff --git a/rdfsurfaces/edt/edt-output.s → examples/out/edt.pl.out b/rdfsurfaces/edt/edt-output.s → examples/out/edt.pl.out
diff --git a/rdfsurfaces/fibonacci/fibonacci-output.s → examples/out/fibonacci.pl.out b/rdfsurfaces/fibonacci/fibonacci-output.s → examples/out/fibonacci.pl.out
diff --git a/rdfsurfaces/graph/graph-output.s → examples/out/graph.pl.out b/rdfsurfaces/graph/graph-output.s → examples/out/graph.pl.out
diff --git a/rdfsurfaces/lubm/lubm-output.s → examples/out/lubm.pl.out b/rdfsurfaces/lubm/lubm-output.s → examples/out/lubm.pl.out
diff --git a/rdfsurfaces/peano/peano-output.s → examples/out/peano.pl.out b/rdfsurfaces/peano/peano-output.s → examples/out/peano.pl.out
diff --git a/rdfsurfaces/pi/pi-output.s → examples/out/pi.pl.out b/rdfsurfaces/pi/pi-output.s → examples/out/pi.pl.out
diff --git a/rdfsurfaces/policy/policy-output.s → examples/out/policy.pl.out b/rdfsurfaces/policy/policy-output.s → examples/out/policy.pl.out
diff --git a/rdfsurfaces/dqc/sdcoding-output.s → examples/out/sdcoding.pl.out b/rdfsurfaces/dqc/sdcoding-output.s → examples/out/sdcoding.pl.out
diff --git a/rdfsurfaces/socrates/socrates-output.s → examples/out/socrates.pl.out b/rdfsurfaces/socrates/socrates-output.s → examples/out/socrates.pl.out
diff --git a/rdfsurfaces/turing/turing-output.s → examples/out/turing.pl.out b/rdfsurfaces/turing/turing-output.s → examples/out/turing.pl.out
diff --git a/rdfsurfaces/universal/universal-output.s → examples/out/universal.pl.out b/rdfsurfaces/universal/universal-output.s → examples/out/universal.pl.out
diff --git a/rdfsurfaces/witch/witch-output.s → examples/out/witch.pl.out b/rdfsurfaces/witch/witch-output.s → examples/out/witch.pl.out
diff --git a/rdfsurfaces/peano/peano.s → examples/peano.pl b/rdfsurfaces/peano/peano.s → examples/peano.pl
diff --git a/rdfsurfaces/pi/pi.s → examples/pi.pl b/rdfsurfaces/pi/pi.s → examples/pi.pl
diff --git a/rdfsurfaces/policy/policy.s → examples/policy.pl b/rdfsurfaces/policy/policy.s → examples/policy.pl
diff --git a/rdfsurfaces/dqc/sdcoding.s → examples/sdcoding.pl b/rdfsurfaces/dqc/sdcoding.s → examples/sdcoding.pl
diff --git a/rdfsurfaces/socrates/socrates.s → examples/socrates.pl b/rdfsurfaces/socrates/socrates.s → examples/socrates.pl
diff --git a/rdfsurfaces/turing/turing.s → examples/turing.pl b/rdfsurfaces/turing/turing.s → examples/turing.pl
diff --git a/rdfsurfaces/universal/universal.s → examples/universal.pl b/rdfsurfaces/universal/universal.s → examples/universal.pl
diff --git a/rdfsurfaces/witch/witch.s → examples/witch.pl b/rdfsurfaces/witch/witch.s → examples/witch.pl
diff --git a/rdfsurfaces/beetle/README b/rdfsurfaces/beetle/README
diff --git a/rdfsurfaces/beetle/test b/rdfsurfaces/beetle/test
diff --git a/rdfsurfaces/complex/README b/rdfsurfaces/complex/README
diff --git a/rdfsurfaces/complex/test b/rdfsurfaces/complex/test
diff --git a/rdfsurfaces/contradiction/README b/rdfsurfaces/contradiction/README
diff --git a/rdfsurfaces/contradiction/test b/rdfsurfaces/contradiction/test
diff --git a/rdfsurfaces/dishes/README b/rdfsurfaces/dishes/README
diff --git a/rdfsurfaces/dishes/test b/rdfsurfaces/dishes/test
diff --git a/rdfsurfaces/dqc/README b/rdfsurfaces/dqc/README
diff --git a/rdfsurfaces/dqc/test b/rdfsurfaces/dqc/test
diff --git a/rdfsurfaces/edt/README b/rdfsurfaces/edt/README
diff --git a/rdfsurfaces/edt/test b/rdfsurfaces/edt/test
diff --git a/rdfsurfaces/fibonacci/README b/rdfsurfaces/fibonacci/README
diff --git a/rdfsurfaces/fibonacci/test b/rdfsurfaces/fibonacci/test
diff --git a/rdfsurfaces/graph/README b/rdfsurfaces/graph/README
diff --git a/rdfsurfaces/graph/test b/rdfsurfaces/graph/test
diff --git a/rdfsurfaces/lubm/README b/rdfsurfaces/lubm/README
diff --git a/rdfsurfaces/lubm/test b/rdfsurfaces/lubm/test
diff --git a/rdfsurfaces/peano/README b/rdfsurfaces/peano/README
diff --git a/rdfsurfaces/peano/test b/rdfsurfaces/peano/test
diff --git a/rdfsurfaces/pi/README b/rdfsurfaces/pi/README
diff --git a/rdfsurfaces/pi/test b/rdfsurfaces/pi/test
diff --git a/rdfsurfaces/policy/README b/rdfsurfaces/policy/README
diff --git a/rdfsurfaces/policy/test b/rdfsurfaces/policy/test
diff --git a/rdfsurfaces/socrates/README b/rdfsurfaces/socrates/README
diff --git a/rdfsurfaces/socrates/test b/rdfsurfaces/socrates/test
diff --git a/rdfsurfaces/turing/README b/rdfsurfaces/turing/README
diff --git a/rdfsurfaces/turing/test b/rdfsurfaces/turing/test
diff --git a/rdfsurfaces/universal/README b/rdfsurfaces/universal/README
diff --git a/rdfsurfaces/universal/test b/rdfsurfaces/universal/test
diff --git a/rdfsurfaces/witch/README b/rdfsurfaces/witch/README
diff --git a/rdfsurfaces/witch/test b/rdfsurfaces/witch/test
diff --git a/retina b/retina
diff --git a/retina.pl b/retina.pl
@@ -26,7 +26,7 @@
 :- dynamic('<http://www.w3.org/2000/10/swap/log#onQuerySurface>'/2).
 :- dynamic('<http://www.w3.org/2000/10/swap/log#onQuestionSurface>'/2).
 
-version_info('retina v5.2.0 (2023-11-07)').
+version_info('retina v5.2.1 (2023-11-08)').
 
 % run
 run :-

diff --git a/test b/test
@@ -3,30 +3,28 @@
 RED="\e[31m"
 GREEN="\e[32m"
 YELLOW="\e[33m"
-BLUE="\e[34m"
 NORMAL="\e[0;39m"
 
 OK=0
 FAILED=0
 
 echo -e "${YELLOW}Running retina/test${NORMAL}"
+echo ""
 
-pushd rdfsurfaces > /dev/null
-for dir in */
+pushd ./examples > /dev/null
+for f in *.pl
 do
-    pushd "${dir}" > /dev/null
-    ./test
-    if [[ $(git status -s . | wc -l) -ne 0 ]]; then
-        echo -e "${RED}${dir} FAILED${NORMAL}"
+    tpl -g run ../retina.pl $f | tee out/$f.out
+    if [[ $(git diff out/$f.out | wc -l) -ne 0 ]]; then
+        echo -e "${RED}${f} FAILED${NORMAL}"
         ((FAILED++))
     else
-        echo -e "${GREEN}${dir} OK${NORMAL}"
+        echo -e "${GREEN}${f} OK${NORMAL}"
         ((OK++))
     fi
-    popd > /dev/null
     echo ""
 done
-popd > /dev/null
+popd  > /dev/null
 
 echo -e "Tests: ${GREEN}${OK} OK${NORMAL} ${RED}${FAILED} FAILED${NORMAL}"