From 82060adcde88eb57cc0a3b71d23f003f5637986f Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 28 Jan 2012 22:08:39 -0500 Subject: [PATCH] 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 --- src/glsl/glcpp/tests/glcpp-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.30.2