Port framework changes from master

Now requiring the headers to be configured for OpenCL > 2.1.

test_conformance/images/clCopyImage/CMakeLists.txt

@@ -21,6 +21,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/conversions.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 include(../../CMakeCommon.txt)

test_conformance/images/clFillImage/CMakeLists.txt

@@ -20,6 +20,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/conversions.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 

test_conformance/images/clFillImage/test_fill_2D_array.cpp

@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2017 The Khronos Group Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

test_conformance/images/clGetInfo/CMakeLists.txt

@@ -16,6 +16,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/testHarness.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 include(../../CMakeCommon.txt)

test_conformance/images/clReadWriteImage/CMakeLists.txt

@@ -17,6 +17,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/testHarness.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 include(../../CMakeCommon.txt)

test_conformance/images/kernel_image_methods/CMakeLists.txt

@@ -17,6 +17,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/testHarness.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 include(../../CMakeCommon.txt)

test_conformance/images/kernel_image_methods/main.cpp

@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 #include "../../../test_common/harness/compat.h"
+#include "../../../test_common/harness/parseParameters.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -74,6 +75,13 @@ int main(int argc, const char *argv[])
 {
     cl_channel_type chanType;
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        test_finish();
+        return -1;
+    }
+  
     checkDeviceTypeOverride( &gDeviceType );
 
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );

test_conformance/images/kernel_read_write/CMakeLists.txt

@@ -22,6 +22,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/testHarness.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 include(../../CMakeCommon.txt)

test_conformance/images/kernel_read_write/main.cpp

@@ -25,6 +25,7 @@
 
 #include "../testBase.h"
 #include "../../../test_common/harness/fpcontrol.h"
+#include "../../../test_common/harness/parseParameters.h"
 
 #include <vector>
 
@@ -266,6 +267,13 @@ int main(int argc, const char *argv[])
     cl_channel_type chanType;
     cl_channel_order chanOrder;
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        test_finish();
+        return -1;
+    }
+
     //Check CL_DEVICE_TYPE environment variable
     checkDeviceTypeOverride( &gDeviceType );
 

test_conformance/images/samplerlessReads/CMakeLists.txt

@@ -18,6 +18,8 @@ set(${MODULE_NAME}_SOURCES
     ../../../test_common/harness/testHarness.c
     ../../../test_common/harness/typeWrappers.cpp
     ../../../test_common/harness/msvc9.c
+    ../../../test_common/harness/parseParameters.cpp
+    ../../../test_common/harness/crc32.c
 )
 
 include(../../CMakeCommon.txt)

test_conformance/images/samplerlessReads/main.cpp

@@ -25,6 +25,7 @@
 
 #include "../testBase.h"
 #include "../../../test_common/harness/fpcontrol.h"
+#include "../../../test_common/harness/parseParameters.h"
 
 #if defined(__PPC__)
 // Global varaiable used to hold the FPU control register state. The FPSCR register can not
@@ -87,6 +88,12 @@ int main(int argc, const char *argv[])
     cl_channel_type chanType;
     cl_channel_order chanOrder;
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        return -1;
+    }
+
     //Check CL_DEVICE_TYPE environment variable
     checkDeviceTypeOverride( &gDeviceType );