Port framework changes from master

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

test_conformance/SVM/CMakeLists.txt

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

test_conformance/allocations/CMakeLists.txt

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

test_conformance/allocations/main.cpp

@@ -19,6 +19,7 @@
 #include "allocation_fill.h"
 #include "allocation_execute.h"
 #include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 #include <time.h>
 
 typedef long long unsigned llu;
@@ -273,6 +274,13 @@ int main(int argc, const char *argv[])
     char *endPtr;
     int r;
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        test_finish();
+        return 1;
+    }
+
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )

test_conformance/api/CMakeLists.txt

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

test_conformance/atomics/CMakeLists.txt

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

test_conformance/basic/CMakeLists.txt

@@ -73,6 +73,8 @@ set(${MODULE_NAME}_SOURCES
     test_global_linear_id.c
     test_local_linear_id.c
     test_progvar.cpp
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
 if(APPLE)

test_conformance/buffers/CMakeLists.txt

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

test_conformance/c11_atomics/CMakeLists.txt

@@ -11,8 +11,8 @@ set(${MODULE_NAME}_SOURCES
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
-
-
 include(../CMakeCommon.txt)

test_conformance/commonfns/CMakeLists.txt

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

test_conformance/compiler/CMakeLists.txt

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

test_conformance/compiler/test_build_helpers.c

@@ -14,7 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-
+#include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 
 const char *sample_kernel_code_single_line[] = {
 "__kernel void sample_test(__global float *src, __global int *dst)\n"

test_conformance/computeinfo/CMakeLists.txt

@@ -5,7 +5,9 @@ set(${MODULE_NAME}_SOURCES
         ../../test_common/harness/errorHelpers.c
         ../../test_common/harness/msvc9.c
         ../../test_common/harness/kernelHelpers.c
+        ../../test_common/harness/parseParameters.cpp
         ../../test_common/harness/testHarness.c
+        ../../test_common/harness/crc32.c
 )
 
 include(../CMakeCommon.txt)

test_conformance/contractions/CMakeLists.txt

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

test_conformance/contractions/contractions.c

@@ -36,6 +36,7 @@
 #include "../../test_common/harness/rounding_mode.h"
 #include "../../test_common/harness/fpcontrol.h"
 #include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 #if defined( __APPLE__ )
 #include <sys/sysctl.h>
 #endif
@@ -321,6 +322,12 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main( int argc, const char **argv )
 {
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        return -1;
+    }
+
     int error = ParseArgs( argc, argv );
 
     if( !error )

test_conformance/conversions/CMakeLists.txt

@@ -17,9 +17,10 @@ set (${MODULE_NAME}_SOURCES
       ../../test_common/harness/msvc9.c
       ../../test_common/harness/mingw_compat.c
       ../../test_common/harness/errorHelpers.c
+      ../../test_common/harness/parseParameters.cpp
       ../../test_common/harness/kernelHelpers.c
       ../../test_common/harness/testHarness.c
-      ../../test_common/harness/parseParameters.cpp
+      ../../test_common/harness/crc32.c
 )
 
 if(ANDROID)

test_conformance/conversions/test_conversions.c

@@ -288,6 +288,12 @@ int main (int argc, const char **argv )
     int error;
     cl_uint seed = (cl_uint) time( NULL );
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        return 1;
+    }
+
     if( (error = ParseArgs( argc, argv )) )
         return error;
 

test_conformance/d3d10/CMakeLists.txt

@@ -31,7 +31,10 @@ set(D3D10_SOURCES
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/conversions.c
-    ../../test_common/harness/msvc9.c)
+    ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
+)
 
 add_executable(conformance_test_d3d10
     ${D3D10_SOURCES})

test_conformance/d3d10/main.cpp

@@ -17,13 +17,17 @@
 
 #define _CRT_SECURE_NO_WARNINGS
 #include "harness.h"
+#include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
     cl_int result;
     cl_platform_id platform = NULL;
     cl_uint num_devices_tested = 0;
 
+    argc = parseCustomParam(argc, argv);
+
     // get the platform to test
     result = clGetPlatformIDs(1, &platform, NULL); NonTestRequire(result == CL_SUCCESS, "Failed to get any platforms.");
 

test_conformance/d3d11/CMakeLists.txt

@@ -31,7 +31,10 @@ set(D3D11_SOURCES
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/conversions.c
-    ../../test_common/harness/msvc9.c)
+    ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
+)
 
 add_executable(conformance_test_d3d11
     ${D3D11_SOURCES})

test_conformance/d3d11/main.cpp

@@ -19,13 +19,17 @@
 #include <vector>
 #include <algorithm>
 #include "harness.h"
+#include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
     cl_int result;
     cl_platform_id platform = NULL;
     cl_uint num_devices_tested = 0;
 
+    argc = parseCustomParam(argc, argv);
+
     // get the platforms to test
     result = clGetPlatformIDs(1, &platform, NULL); NonTestRequire(result == CL_SUCCESS, "Failed to get any platforms.");
 

test_conformance/device_execution/CMakeLists.txt

@@ -19,6 +19,8 @@ set(DEVICE_EXECUTION_SOURCES
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
 include(../CMakeCommon.txt)

test_conformance/device_execution/main.c

@@ -21,6 +21,7 @@
 #endif
 
 #include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 #include "utils.h"
 #include "procs.h"
 
@@ -75,6 +76,8 @@ test_status deviceCheck(cl_device_id device)
 
 int main(int argc, const char *argv[])
 {
+    argc = parseCustomParam(argc, argv);
+
     for (int i = 0; i < argc; ++i) {
       int argsRemoveNum = 0;
       if ( strcmp(argv[i], "-kernelName") == 0 ) {

test_conformance/device_partition/CMakeLists.txt

@@ -12,5 +12,7 @@ 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/events/CMakeLists.txt

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

test_conformance/generic_address_space/CMakeLists.txt

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

test_conformance/geometrics/CMakeLists.txt

@@ -11,6 +11,8 @@ set(${MODULE_NAME}_SOURCES
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/conversions.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
 # VS2005 optimization WAR for geom_length)

test_conformance/gl/CMakeLists.txt

@@ -31,6 +31,8 @@ set (GL_SOURCES
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/conversions.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
     ../../test_common/harness/imageHelpers.cpp
     )
 

test_conformance/gl/main.cpp

@@ -25,6 +25,7 @@
 #include "procs.h"
 #include "../../test_common/gl/setup.h"
 #include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>
@@ -160,7 +161,13 @@ int main(int argc, const char *argv[])
   int error = 0;
   int numErrors = 0;
 
-    test_start();
+  test_start();
+  argc = parseCustomParam(argc, argv);
+  if (argc == -1)
+  {
+    test_finish ();
+    return -1;
+  }	
 
   cl_device_type requestedDeviceType = CL_DEVICE_TYPE_DEFAULT;
   checkDeviceTypeOverride(&requestedDeviceType);

test_conformance/gles/CMakeLists.txt

@@ -9,7 +9,7 @@ set (${MODULE_NAME}_SOURCES
         test_images_2D_info.cpp
         test_images_3D_info.cpp
         test_renderbuffer_info.cpp
-		test_fence_sync.cpp
+        test_fence_sync.cpp
         helpers.cpp
         setup_egl.cpp
         ../../test_common/gles/helpers.cpp
@@ -21,6 +21,8 @@ set (${MODULE_NAME}_SOURCES
         ../../test_common/harness/mt19937.c
         ../../test_common/harness/conversions.c
         ../../test_common/harness/msvc9.c
+        ../../test_common/harness/parseParameters.cpp
+        ../../test_common/harness/crc32.c
     )
 
 if(ANDROID)

test_conformance/half/CMakeLists.txt

@@ -10,8 +10,9 @@ set(${MODULE_NAME}_SOURCES
         ../../test_common/harness/errorHelpers.c
         ../../test_common/harness/kernelHelpers.c
         ../../test_common/harness/ThreadPool.c
-        ../../test_common/harness/testHarness.c
         ../../test_common/harness/parseParameters.cpp
+        ../../test_common/harness/testHarness.c
+        ../../test_common/harness/crc32.c
 )
 
 include(../CMakeCommon.txt)

test_conformance/half/main.c

@@ -93,6 +93,13 @@ int main (int argc, const char **argv )
         g_arrVecAligns[i] = alignbound;
     }
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        test_finish();
+        return -1;
+    }
+
     if( (error = ParseArgs( argc, argv )) )
         goto exit;
 

test_conformance/headers/CMakeLists.txt

@@ -4,6 +4,8 @@ set(HEADERS_SOURCES
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/testHarness.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
 set_source_files_properties(${HEADERS_SOURCES} PROPERTIES LANGUAGE CXX)

test_conformance/headers/test_headers.c

@@ -18,7 +18,7 @@
 #else
     #include <CL/cl_platform.h>
 #endif
-
+#include <stdio.h>
 #include "../../test_common/harness/errorHelpers.h"
 #include "../../test_common/harness/testHarness.h"
 

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 );
 

test_conformance/integer_ops/CMakeLists.txt

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

test_conformance/math_brute_force/CMakeLists.txt

@@ -23,10 +23,11 @@ set(${MODULE_NAME}_SOURCES
     ../../test_common/harness/ThreadPool.c
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/errorHelpers.c
     ../../test_common/harness/testHarness.c
-    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
 
@@ -51,6 +52,7 @@ endif(NOT ANDROID)
 
 set_source_files_properties(
     ${MODULE_NAME}_SOURCES
+    ../../test_common/harness/crc32.c
     PROPERTIES LANGUAGE CXX)
 
 if(CMAKE_COMPILER_IS_GNUCC)

test_conformance/math_brute_force/main.c

@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/parseParameters.h"
 #include "Utility.h"
 
 #include <stdio.h>
@@ -26,6 +25,7 @@
 
 #include "../../test_common/harness/errorHelpers.h"
 #include "../../test_common/harness/kernelHelpers.h"
+#include "../../test_common/harness/parseParameters.h"
 
 #if defined( __APPLE__ )
     #include <sys/sysctl.h>
@@ -814,6 +814,11 @@ int main (int argc, const char * argv[])
 {
     int error;
 
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        return -1;
+    }
     atexit(TestFinishAtExit);
 
 #if defined( __APPLE__ )

test_conformance/mem_host_flags/CMakeLists.txt

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

test_conformance/multiple_device_context/CMakeLists.txt

@@ -13,6 +13,8 @@ set(${MODULE_NAME}_SOURCES
     ../../test_common/harness/conversions.c
     ../../test_common/harness/mt19937.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
 )
 
 
@@ -28,6 +30,8 @@ set_source_files_properties(
     ../../test_common/harness/kernelHelpers.c
     ../../test_common/harness/conversions.c
     ../../test_common/harness/msvc9.c
+    ../../test_common/harness/parseParameters.cpp
+    ../../test_common/harness/crc32.c
         PROPERTIES LANGUAGE CXX)
 
 include(../CMakeCommon.txt)

test_conformance/non_uniform_work_group/CMakeLists.txt

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

test_conformance/pipes/CMakeLists.txt

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

test_conformance/printf/CMakeLists.txt

@@ -14,6 +14,9 @@ set(${MODULE_NAME}_SOURCES
          ../../test_common/harness/msvc9.c
          ../../test_common/harness/testHarness.c
          #../../test_common/harness/imageHelpers.cpp
+         ../../test_common/harness/parseParameters.cpp
+         ../../test_common/harness/kernelHelpers.c
+         ../../test_common/harness/crc32.c
          )
 
 include(../CMakeCommon.txt)

test_conformance/printf/test_printf.c

@@ -41,6 +41,7 @@
 #include "../../test_common/harness/errorHelpers.h"
 #include "../../test_common/harness/kernelHelpers.h"
 #include "../../test_common/harness/mt19937.h"
+#include "../../test_common/harness/parseParameters.h"
 
 typedef  unsigned int uint32_t;
 
@@ -994,8 +995,14 @@ const int test_num = ARRAY_SIZE( test_list );
 //-----------------------------------------
 // main
 //-----------------------------------------
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
+    argc = parseCustomParam(argc, argv);
+    if (argc == -1)
+    {
+        return -1;
+    }
+
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )

test_conformance/profiling/CMakeLists.txt

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

test_conformance/relationals/CMakeLists.txt

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

test_conformance/select/CMakeLists.txt

@@ -9,6 +9,7 @@ set(${MODULE_NAME}_SOURCES
         ../../test_common/harness/kernelHelpers.c
         ../../test_common/harness/errorHelpers.c
         ../../test_common/harness/parseParameters.cpp
+        ../../test_common/harness/crc32.c
 )
 
 include(../CMakeCommon.txt)

test_conformance/spir/CMakeLists.txt

@@ -17,7 +17,8 @@ set (SPIR_SOURCES
     ../../test_common/harness/msvc9.c
     ../../test_common/harness/os_helpers.cpp
     ../../test_common/harness/testHarness.c
-    ../../test_common/miniz/miniz.c)
+    ../../test_common/miniz/miniz.c
+    ../../test_common/harness/crc32.c)
 
 add_executable(${SPIR_OUT}
     ${SPIR_SOURCES})

test_conformance/spir/main.cpp

@@ -349,7 +349,6 @@ bool test_suite(cl_device_id device, cl_uint size_t_width, const char *folder,
         std::cout << std::endl;
         return false;
     }
-
     std::cout << std::endl;
     return true;
 }

test_conformance/subgroups/CMakeLists.txt

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

test_conformance/thread_dimensions/CMakeLists.txt

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

test_conformance/vec_align/CMakeLists.txt

@@ -12,6 +12,8 @@ set(${MODULE_NAME}_SOURCES
         ../../test_common/harness/kernelHelpers.c
         ../../test_common/harness/errorHelpers.c
         ../../test_common/harness/conversions.c
+        ../../test_common/harness/parseParameters.cpp
+        ../../test_common/harness/crc32.c
 )
 
 set_source_files_properties(

test_conformance/vec_step/CMakeLists.txt

@@ -11,6 +11,8 @@ set(${MODULE_NAME}_SOURCES
         ../../test_common/harness/msvc9.c
         ../../test_common/harness/kernelHelpers.c
         ../../test_common/harness/errorHelpers.c
+        ../../test_common/harness/parseParameters.cpp
+        ../../test_common/harness/crc32.c
 )
 
 set_source_files_properties(

test_conformance/workgroups/CMakeLists.txt

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