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

diff --git a/obn-run-tests.sh b/obn-run-tests.sh
index 62fc967..2ce7572 100755
--- a/obn-run-tests.sh
+++ b/obn-run-tests.sh
@@ -2,20 +2,24 @@
 
 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 $?:"
 		echo "$LOG"
-		echo "Test fail: $1 compile-time $?"
+		echo "=============================="
+		echo
 	fi
 	if [ $OK = 1 ]; then
 		if ! ./obn-run.sh $1; then
 			OK=0
-			echo "$LOG"
-			echo "Test fail: $1 run-time $?"
 		fi
 	fi
 	if [ $OK = 1 ]; then
@@ -23,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
@@ -50,3 +76,29 @@ 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
+maketest Test21
+maketest Test22
+
+makecomp Test23A
+makefail Test23B
+
+maketest Test24
+maketest Test25
+maketest Test26
+maketest Test27
+maketest Test28
+maketest Test29