From: Matt Turner Date: Sun, 29 Jan 2012 03:08:39 +0000 (-0500) Subject: glcpp-test: don't return failure if valgrind tests aren't run X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82060adcde88eb57cc0a3b71d23f003f5637986f;p=mesa.git glcpp-test: don't return failure if valgrind tests aren't run Success was (tests-passed AND valgrind-tests-passed) but this meant that if the valgrind tests weren't run it would be considered a failure. The logic is now (tests-passed AND (!valgrind OR valgrind-tests-passed)) which lets us return success if the valgrind tests aren't run. Reviewed-by: Eric Anholt Tested-by: Eric Anholt Signed-off-by: Matt Turner --- diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test index e8f3b546387..1db75237567 100755 --- a/src/glsl/glcpp/tests/glcpp-test +++ b/src/glsl/glcpp/tests/glcpp-test @@ -72,7 +72,7 @@ if [ "$do_valgrind" = "yes" ]; then echo "$clean/$total tests are valgrind-clean" fi -if [ "$pass" = "$total" ] && [ "$clean" = "$total" ]; then +if [ "$pass" = "$total" ] && [ "$do_valgrind" != "yes" ] || [ "$pass" = "$total" ]; then exit 0 else exit 1