X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=obn-run-tests.sh;h=57756c3e9669ed1f9fb5a9a1355b419d3f7b3056;hb=57963798c338b0b73e032e9288003fd462f8b954;hp=70a1ea639fa66156b76136ee13d8fe1a3ae4b05d;hpb=9531d399c60190a8daf625dd99f9c141753bba5e;p=dsw-obn.git

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index 70a1ea6..57756c3 100755
--- 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 "=============================="
@@ -90,3 +87,11 @@ makefail Test17F
 makecomp Test18A
 makefail Test18B
 makefail Test18C
+
+maketest Test19
+maketest Test20
+maketest Test21
+maketest Test22
+
+makecomp Test23A
+makefail Test23B