fix check.sh and add return 0 to examples missing the statement

shogun-toolbox · Aug 19, 2011 · 4d140a3 · 4d140a3
1 parent 316fcc9
commit 4d140a3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/examples/undocumented/libshogun/check.sh b/examples/undocumented/libshogun/check.sh
@@ -2,24 +2,24 @@
 
 rm -f error.log
 
-MAKEOPTS=""
-test -n "$LIBRARY_PATH" && MAKEOPTS="LIBRARY_PATH=\"${LIBRARY_PATH}\" ${MAKEOPTS}"
-test -n "$LIB_PATH" && MAKEOPTS="LIB_PATH=\"${LIB_PATH}\" ${MAKEOPTS}"
-test -n "$INC_PATH" && MAKEOPTS="INC_PATH=\"${INC_PATH}\" ${MAKEOPTS}"
-test -n "$LIBS" && MAKEOPTS="LIBS=\"${LIBS}\" ${MAKEOPTS}"
+test -n "$LIBRARY_PATH" && LIBRARY_PATH="LIBRARY_PATH=${LIBRARY_PATH}"
+test -n "$LIB_PATH" && LIB_PATH="LIB_PATH=${LIB_PATH}"
+test -n "$INC_PATH" && INC_PATH="INC_PATH=${INC_PATH}"
+test -n "$LIBS" && LIBS="LIBS=${LIBS}"
 
-for e in `make print_targets`
+for e in `make print_targets | grep -v ^make`
 do
 	echo -n "running $e .."
-	if make $MAKEOPTS "$e" >/dev/null 2>&1 && "./$e" >/dev/null 2>&1
+	if make "$e" $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS >/dev/null 2>&1 && "./$e" >/dev/null 2>&1
 	then
 		echo " OK"
 	else
 		echo " ERROR"
 		echo "================================================================================" >>error.log
-		echo " error in $e ">>error.log
+		echo "error in make $e $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS" >>error.log
+		echo "error in ./$e" >>error.log 2>&1
 		echo "================================================================================" >>error.log
-		make $MAKEOPTS "$e" >>error.log 2>&1 && "./$e">>error.log 2>&1
+		make "$e" $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS >>error.log 2>&1 && "./$e" >>error.log
 		echo "================================================================================" >>error.log
 		echo >>error.log
 		echo >>error.log

diff --git a/examples/undocumented/libshogun/classifier_mklmulticlass.cpp b/examples/undocumented/libshogun/classifier_mklmulticlass.cpp
@@ -355,4 +355,6 @@ int main()
 	}
 
 	exit_shogun();
+
+	return 0;
 }
diff --git a/examples/undocumented/libshogun/library_dyn_int.cpp b/examples/undocumented/libshogun/library_dyn_int.cpp
@@ -117,4 +117,6 @@ int main()
 	}
 
 	exit_shogun();
+
+	return 0;
 }
diff --git a/examples/undocumented/libshogun/streaming_onlinesvmsgd.cpp b/examples/undocumented/libshogun/streaming_onlinesvmsgd.cpp
@@ -65,4 +65,6 @@ int main()
 	SG_UNREF(sgd);
 
 	exit_shogun();
+
+	return 0;
 }
diff --git a/examples/undocumented/libshogun/streaming_vowpalwabbit.cpp b/examples/undocumented/libshogun/streaming_vowpalwabbit.cpp
@@ -43,4 +43,6 @@ int main()
 	SG_UNREF(vw);
 
 	exit_shogun();
+
+	return 0;
 }
diff --git a/examples/undocumented/libshogun/streaming_vwfeatures.cpp b/examples/undocumented/libshogun/streaming_vwfeatures.cpp
@@ -61,4 +61,6 @@ int main()
 	SG_UNREF(sgd);
 
 	exit_shogun();
+
+	return 0;
 }