diff options
| author | Matt Turner <[email protected]> | 2012-01-28 22:08:39 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-30 21:09:57 -0500 |
| commit | 82060adcde88eb57cc0a3b71d23f003f5637986f (patch) | |
| tree | baa625d053989eaa0aa86bcea48246b2abfeb96e | |
| parent | 9947656168d09f9019600fccc42ca8e0de49b83a (diff) | |
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 <[email protected]>
Tested-by: Eric Anholt <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
| -rwxr-xr-x | 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 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 |