make test scripts fail when a test fails

shogun-toolbox · Mar 27, 2013 · ef114dd · ef114dd
1 parent 0eff35b
commit ef114dd
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 2 deletions.
diff --git a/tests/integration/matlab_and_octave/test_all.sh b/tests/integration/matlab_and_octave/test_all.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 DATAPATH='../data'
+exitcode=0
 
 function test_all () {
 	datapath="$1"
@@ -31,6 +32,7 @@ function test_all () {
 
 		# thanks to matlab, 1 means ok and 0 means error
 		if [ "$?" -ne 0 -o "${ans}" -eq 0 ]; then
+			exitcode=1
 			echo ERROR
 			echo ${output}
 		else
@@ -55,3 +57,4 @@ else
 		test_all "$i/*.m"
 	done
 fi
+exit $exitcode
diff --git a/tests/integration/octave_modular/regression.m b/tests/integration/octave_modular/regression.m
@@ -18,8 +18,8 @@
 
 	lab=Labels(regression_labels);
 
-	if strcmp(regression_name, 'KRR')==1
-		regression=KRR(regression_tau, kernel, lab);
+	if strcmp(regression_name, 'KernelRidgeRegression')==1
+		regression=KernelRidgeRegression(regression_tau, kernel, lab);
 
 	elseif strcmp(regression_name, 'LibSVR')==1
 		regression=LibSVR(regression_C, regression_epsilon, kernel, lab);

diff --git a/tests/integration/octave_modular/test_all.sh b/tests/integration/octave_modular/test_all.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 DATAPATH='../data'
+exitcode=0
 
 function test_all () {
 	datapath=${1}
@@ -23,6 +24,7 @@ function test_all () {
 
 		# thanks to matlab, 1 means ok and 0 means error
 		if [ ${ans} -eq 0 ]; then
+			exitcode=1
 			echo ERROR
 			# remove octave banner
 			echo ${output} | grep -v 'GNU Octave'
@@ -41,3 +43,4 @@ else
 		test_all "${i}/*.m"
 	done
 fi
+exit $exitcode
diff --git a/tests/integration/perl_modular/test_all.sh b/tests/integration/perl_modular/test_all.sh
@@ -6,6 +6,7 @@ then
 fi
 
 DATAPATH='../data'
+exitcode=0
 
 function test_all () {
     datapath="$1"
@@ -27,6 +28,7 @@ function test_all () {
 	    echo 'OK'
 	else
 	    echo 'ERROR'
+		exitcode=1
 	    echo $output
 	fi
     done
@@ -41,3 +43,4 @@ else
 	test_all "$i/*.m"
     done
 fi
+exit $exitcode
diff --git a/tests/integration/python_modular/test_all.sh b/tests/integration/python_modular/test_all.sh
@@ -6,6 +6,7 @@ then
 fi
 
 DATAPATH='../data'
+exitcode=0
 
 function test_all () {
 	datapath="$1"
@@ -27,6 +28,7 @@ function test_all () {
 		if [ $ret -eq 0 ] ; then
 			echo 'OK'
 		else
+			exitcode=1
 			echo 'ERROR'
 			echo $output
 		fi
@@ -42,3 +44,4 @@ else
 		test_all "$i/*.m"
 	done
 fi
+exit $exitcode
diff --git a/tests/integration/python_static/test_all.sh b/tests/integration/python_static/test_all.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 DATAPATH='../data'
+exitcode=0
 
 [ -z "$PYTHON" ] && PYTHON=python
 
@@ -24,6 +25,7 @@ function test_all () {
 		if [ $ret -eq 0 ] ; then
 			echo 'OK'
 		else
+			exitcode=1
 			echo 'ERROR'
 			echo $output
 		fi
@@ -39,3 +41,5 @@ else
 		test_all "$i/*.m"
 	done
 fi
+
+exit $exitcode
diff --git a/tests/integration/r_modular/test_all.sh b/tests/integration/r_modular/test_all.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 DATAPATH='../data'
+exitcode=0
 
 function test_all () {
 	datapath=${1}
@@ -22,6 +23,7 @@ function test_all () {
 
 			output=`R --no-save --no-restore --no-readline --slave ${file} < test_one.R`
 			if [ $? -ne 0 ]; then
+				exitcode=1
 				echo ERROR
 				echo ${output}
 			else
@@ -40,3 +42,4 @@ else
 		test_all "${i}/*.m"
 	done
 fi
+exit $exitcode
diff --git a/tests/integration/r_static/test_all.sh b/tests/integration/r_static/test_all.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 DATAPATH='../data'
+exitcode=0
 
 function test_all () {
 	datapath=${1}
@@ -23,6 +24,7 @@ function test_all () {
 
 			output=`R --no-save --no-restore --no-readline --slave ${file} < test_one.R`
 			if [ $? -ne 0 ]; then
+				exitcode=1
 				echo ERROR
 				echo ${output}
 			else
@@ -42,3 +44,4 @@ else
 		test_all "${i}/*.m"
 	done
 fi
+exit $exitcode