Добавлены строки в отладочную информацию класса (быстрохак)

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

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index 7011dc59ada134164831c80e12cf2bb077d5bdc9..2ce75728bd40a4f5c5fb3d3ef6a41f256444f15d 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 "=============================="
@@ -92,3 +89,16 @@ makefail Test18B
 makefail Test18C
 
 maketest Test19
+maketest Test20
+maketest Test21
+maketest Test22
+
+makecomp Test23A
+makefail Test23B
+
+maketest Test24
+maketest Test25
+maketest Test26
+maketest Test27
+maketest Test28
+maketest Test29