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. --- src/glsl/glcpp/tests/glcpp-test | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test index e8f3b54..1db7523 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 -- 1.7.3.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev