Port framework changes from master

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

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