X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=obn-run-tests.sh;h=faaf6eacd92a3c1e2a002f7b5f393b321c1253bf;hb=98752831dc061590acffee7e68a075f8c18cb132;hp=28971d1a35cb6a974b48267dc2153951ee92acf4;hpb=9b4f78290edb5f5bedeb12e683546fa00082f108;p=dsw-obn.git

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index 28971d1..faaf6ea 100755
--- a/obn-run-tests.sh
+++ b/obn-run-tests.sh
@@ -2,15 +2,24 @@
 
 set -e
 
+TEST_DIR=tests
+
+# Тест: компиляция и исполнение
 maketest()
 {
 	local OK=1
-	if ! ./obn-compile.sh $1; then
-		OK=0; echo "Test fail: $1 compile-time $?"
+	local LOG=""
+	if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
+		OK=0;
+		echo "=============================="
+		echo "Test fail: $1 compile-time $?:"
+		echo "$LOG"
+		echo "=============================="
+		echo
 	fi
 	if [ $OK = 1 ]; then
 		if ! ./obn-run.sh $1; then
-			OK=0; echo "Test fail: $1 run-time $?"
+			OK=0
 		fi
 	fi
 	if [ $OK = 1 ]; then
@@ -18,13 +27,35 @@ maketest()
 	fi
 }
 
-compile_false_positive()
+# Тест: только компиляция
+makecomp()
 {
-	if ./obn-compile.sh $1; then
-		echo "Test fail: $1 compile-time $?"
+	local LOG=""
+	if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
+		echo "=============================="
+		echo "Test fail: $1 compile-time $?:"
+		echo "$LOG"
+		echo "=============================="
+		echo
 	else
 		echo "Test ok: $1"
 	fi
+
+}
+
+# Тест: Компиляция не должна проходить
+makefail()
+{
+	local LOG=""
+	if ! LOG="$(./obn-compile.sh -I $TEST_DIR $1)"; then
+		echo "Test ok: $1"
+	else
+		echo "=============================="
+		echo "Test fail: $1 compile-time $?:"
+		echo "$LOG"
+		echo "=============================="
+		echo
+	fi
 }
 
 ./make.sh jvm
@@ -45,3 +76,17 @@ maketest Test13
 maketest Test14
 maketest Test15
 maketest Test16
+
+makefail Test17A
+makefail Test17B
+makecomp Test17C
+makecomp Test17D
+makefail Test17E
+makefail Test17F
+
+makecomp Test18A
+makefail Test18B
+makefail Test18C
+
+maketest Test19
+maketest Test20