[Mesa-dev] [PATCH 4/5] glcpp-test: don't return failure if valgrind tests aren't run

Matt Turner mattst88 at gmail.com
Sun Jan 29 22:09:50 PST 2012


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



More information about the mesa-dev mailing list