JVM: исправлена лишняя печать локальных переменных (.var)

[dsw-obn.git] / obn-run-tests.sh

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index e3e3d5af23365db90c84c03533503c0a55d0c127..57756c3e9669ed1f9fb5a9a1355b419d3f7b3056 100755 (executable)
--- a/obn-run-tests.sh
+++ b/obn-run-tests.sh
@@ -2,12 +2,14 @@
 
 set -e
 
+TEST_DIR=tests
+
 # Тест: компиляция и исполнение
 maketest()
 {
        local OK=1
        local LOG=""
-       if ! LOG="$(./obn-compile.sh $1)"; then
+       if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
                OK=0;
                echo "=============================="
                echo "Test fail: $1 compile-time $?:"
@@ -18,11 +20,6 @@ maketest()
        if [ $OK = 1 ]; then
                if ! ./obn-run.sh $1; then
                        OK=0
-                       echo "=============================="
-                       echo "Test fail: $1 run-time $?:"
-                       echo "$LOG"
-                       echo "=============================="
-                       echo
                fi
        fi
        if [ $OK = 1 ]; then
@@ -34,7 +31,7 @@ maketest()
 makecomp()
 {
        local LOG=""
-       if ! LOG="$(./obn-compile.sh $1)"; then
+       if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
                echo "=============================="
                echo "Test fail: $1 compile-time $?:"
                echo "$LOG"
@@ -50,7 +47,7 @@ makecomp()
 makefail()
 {
        local LOG=""
-       if ! LOG="$(./obn-compile.sh $1)"; then
+       if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
                echo "Test ok: $1"
        else
                echo "=============================="
@@ -79,6 +76,7 @@ maketest Test13
 maketest Test14
 maketest Test15
 maketest Test16
+
 makefail Test17A
 makefail Test17B
 makecomp Test17C
@@ -86,3 +84,14 @@ makecomp Test17D
 makefail Test17E
 makefail Test17F
 
+makecomp Test18A
+makefail Test18B
+makefail Test18C
+
+maketest Test19
+maketest Test20
+maketest Test21
+maketest Test22
+
+makecomp Test23A
+makefail Test23B