[Piglit] [PATCH] array-texture: fail if any of the subtests fail rather than the last

[Ilia Mirkin]

Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
---
 tests/texturing/array-texture.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c
index 9837473..a65d919 100644
--- a/tests/texturing/array-texture.c
+++ b/tests/texturing/array-texture.c
@@ -176,7 +176,7 @@ make_1d_array_texture(void)
 static GLboolean
 test_2d_array_texture(GLuint tex)
 {
-   GLboolean pass;
+   GLboolean pass, ret = GL_TRUE;
    int i;
    float width = piglit_width / NUM_COLORS;
    float x = 0.0;
@@ -200,18 +200,20 @@ test_2d_array_texture(GLuint tex)
       if (!pass) {
          printf("%s: failed for 2D image/slice %d\n", prog, i);
       }
+
+      ret &= pass;
    }
 
    glBindTexture(GL_TEXTURE_2D_ARRAY_EXT, 0);
 
-   return pass;
+   return ret;
 }
 
 
 static GLboolean
 test_1d_array_texture(GLuint tex)
 {
-   GLboolean pass;
+   GLboolean pass, ret = GL_TRUE;
    int i;
    float width = piglit_width / NUM_COLORS;
    float x = 0.0;
@@ -239,11 +241,13 @@ test_1d_array_texture(GLuint tex)
       if (!pass) {
          printf("%s: failed for 1D image/slice %d\n", prog, i);
       }
+
+      ret &= pass;
    }
 
    glBindTexture(GL_TEXTURE_1D_ARRAY_EXT, 0);
 
-   return pass;
+   return ret;
 }
 
 
-- 
1.8.3.2

_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit