X-Git-Url: http://deadsoftware.ru/gitweb?p=dsw-obn.git;a=blobdiff_plain;f=obn-run-tests.sh;h=2ce75728bd40a4f5c5fb3d3ef6a41f256444f15d;hp=e3e3d5af23365db90c84c03533503c0a55d0c127;hb=HEAD;hpb=757bfb90589d07922991e34a4cc36ef434c8e3bb

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index e3e3d5a..2ce7572 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 "=============================="
@@ -79,6 +76,7 @@ maketest Test13
 maketest Test14
 maketest Test15
 maketest Test16
+
 makefail Test17A
 makefail Test17B
 makecomp Test17C
@@ -86,3 +84,21 @@ makecomp Test17D
 makefail Test17E
 makefail Test17F
 
+makecomp Test18A
+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