From faa6ad86c61e579921d3e8d78d4144ec52267416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Petit?= <kpet@free.fr>
Date: Fri, 21 Aug 2020 17:56:10 +0100
Subject: [PATCH] Fail gracefully in CL_MEM_PROPERTIES tests when unexpectedly
 getting zero-size return (#913)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kévin Petit <kpet@free.fr>
---
 .../api/test_mem_object_properties_queries.cpp       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test_conformance/api/test_mem_object_properties_queries.cpp b/test_conformance/api/test_mem_object_properties_queries.cpp
index c38595cc..09ccb475 100644
--- a/test_conformance/api/test_mem_object_properties_queries.cpp
+++ b/test_conformance/api/test_mem_object_properties_queries.cpp
@@ -92,9 +92,17 @@ int create_object_and_check_properties(cl_context context,
                "clGetMemObjectInfo failed asking for CL_MEM_PROPERTIES.");
 
     // verify set_size 0 returned
-    if (test_case.properties.size() == 0 && set_size == 0)
+    if (set_size == 0)
     {
-        return TEST_PASS;
+        if (test_case.properties.size() == 0)
+        {
+            return TEST_PASS;
+        }
+        else
+        {
+            log_error("ERROR: Expected non-zero size!\n");
+            return TEST_FAIL;
+        }
     }
 
     cl_uint number_of_props = set_size / sizeof(cl_mem_properties);