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

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index da13a65..70a1ea6 100755
--- a/obn-run-tests.sh
+++ b/obn-run-tests.sh
@@ -2,15 +2,27 @@
 
 set -e
 
+# Тест: компиляция и исполнение
 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 $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
+			echo "=============================="
+			echo "Test fail: $1 run-time $?:"
+			echo "$LOG"
+			echo "=============================="
+			echo
 		fi
 	fi
 	if [ $OK = 1 ]; then
@@ -18,13 +30,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 $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 $1)"; then
+		echo "Test ok: $1"
+	else
+		echo "=============================="
+		echo "Test fail: $1 compile-time $?:"
+		echo "$LOG"
+		echo "=============================="
+		echo
+	fi
 }
 
 ./make.sh jvm
@@ -38,3 +72,21 @@ maketest Test6
 maketest Test7
 maketest Test8
 maketest Test9
+maketest Test10
+maketest Test11
+maketest Test12
+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