Rename test .c sources to .cpp where necessary (#604)

Remove hacks to force language from CMake files.

Closes KhronosGroup/OpenCL-CTS#25

test_conformance/CMakeCommon.txt

@@ -6,8 +6,6 @@ set(${MODULE_NAME}_OUT ${CONFORMANCE_PREFIX}${MODULE_NAME_LOWER}${CONFORMANCE_SU
 
 add_executable(${${MODULE_NAME}_OUT} ${${MODULE_NAME}_SOURCES})
 
-set_source_files_properties(${${MODULE_NAME}_SOURCES} PROPERTIES LANGUAGE CXX)
-
 set_property(TARGET ${${MODULE_NAME}_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")
 
 TARGET_LINK_LIBRARIES(${${MODULE_NAME}_OUT} ${HARNESS_LIB} ${CLConform_LIBRARIES})

test_conformance/api/CMakeLists.txt

@@ -1,15 +1,15 @@
 set(MODULE_NAME API)
 
 set(${MODULE_NAME}_SOURCES
-         main.c
-         test_bool.c
+         main.cpp
+         test_bool.cpp
          test_retain.cpp
-         test_retain_program.c
+         test_retain_program.cpp
          test_queries.cpp
          test_queries_compatibility.cpp
-         test_create_kernels.c
-         test_kernels.c
-         test_api_min_max.c
+         test_create_kernels.cpp
+         test_kernels.cpp
+         test_api_min_max.cpp
          test_kernel_arg_changes.cpp
          test_kernel_arg_multi_setup.cpp
          test_binary.cpp
@@ -18,9 +18,9 @@ set(${MODULE_NAME}_SOURCES
          test_create_context_from_type.cpp
          test_device_min_data_type_align_size_alignment.cpp
          test_platform.cpp
-         test_kernel_arg_info.c
-         test_kernel_arg_info_compatibility.c
-         test_null_buffer_arg.c
+         test_kernel_arg_info.cpp
+         test_kernel_arg_info_compatibility.cpp
+         test_null_buffer_arg.cpp
          test_mem_object_info.cpp
          test_queue_hint.cpp
          test_queue_properties.cpp

test_conformance/atomics/CMakeLists.txt

@@ -1,9 +1,9 @@
 set(MODULE_NAME ATOMICS)
 
 set(${MODULE_NAME}_SOURCES
-        main.c
+        main.cpp
         test_atomics.cpp
-        test_indexed_cases.c
+        test_indexed_cases.cpp
 )
 
 include(../CMakeCommon.txt)

test_conformance/basic/CMakeLists.txt

@@ -1,49 +1,49 @@
 set(MODULE_NAME BASIC)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_fpmath_float.c test_fpmath_float2.c test_fpmath_float4.c
-    test_intmath_int.c test_intmath_int2.c test_intmath_int4.c
-    test_intmath_long.c test_intmath_long2.c test_intmath_long4.c
-    test_hiloeo.c test_local.c test_pointercast.c
-    test_if.c test_loop.c
-    test_readimage.c test_readimage_int16.c test_readimage_fp32.c
-    test_readimage3d.c test_readimage3d_int16.c test_readimage3d_fp32.c
-    test_writeimage.c test_writeimage_int16.c test_writeimage_fp32.c
-    test_multireadimageonefmt.c test_multireadimagemultifmt.c
-    test_imagedim.c
-    test_vloadstore.c
-    test_int2float.c test_float2int.c
-    test_createkernelsinprogram.c
-    test_hostptr.c
+    main.cpp
+    test_fpmath_float.cpp test_fpmath_float2.cpp test_fpmath_float4.cpp
+    test_intmath_int.cpp test_intmath_int2.cpp test_intmath_int4.cpp
+    test_intmath_long.cpp test_intmath_long2.cpp test_intmath_long4.cpp
+    test_hiloeo.cpp test_local.cpp test_pointercast.cpp
+    test_if.cpp test_loop.cpp
+    test_readimage.cpp test_readimage_int16.cpp test_readimage_fp32.cpp
+    test_readimage3d.cpp test_readimage3d_int16.cpp test_readimage3d_fp32.cpp
+    test_writeimage.cpp test_writeimage_int16.cpp test_writeimage_fp32.cpp
+    test_multireadimageonefmt.cpp test_multireadimagemultifmt.cpp
+    test_imagedim.cpp
+    test_vloadstore.cpp
+    test_int2float.cpp test_float2int.cpp
+    test_createkernelsinprogram.cpp
+    test_hostptr.cpp
     test_explicit_s2v.cpp
-    test_constant.c
-    test_image_multipass.c
-    test_imagereadwrite.c test_imagereadwrite3d.c
-    test_image_param.c
-    test_imagenpot.c
-    test_image_r8.c
-    test_barrier.c
-    test_basic_parameter_types.c
-    test_arrayreadwrite.c
-    test_arraycopy.c
-    test_imagearraycopy.c
-    test_imagearraycopy3d.c
-    test_imagecopy.c
-    test_imagerandomcopy.c
-    test_arrayimagecopy.c
-    test_arrayimagecopy3d.c
-    test_imagecopy3d.c
+    test_constant.cpp
+    test_image_multipass.cpp
+    test_imagereadwrite.cpp test_imagereadwrite3d.cpp
+    test_image_param.cpp
+    test_imagenpot.cpp
+    test_image_r8.cpp
+    test_barrier.cpp
+    test_basic_parameter_types.cpp
+    test_arrayreadwrite.cpp
+    test_arraycopy.cpp
+    test_imagearraycopy.cpp
+    test_imagearraycopy3d.cpp
+    test_imagecopy.cpp
+    test_imagerandomcopy.cpp
+    test_arrayimagecopy.cpp
+    test_arrayimagecopy3d.cpp
+    test_imagecopy3d.cpp
     test_enqueue_map.cpp
     test_work_item_functions.cpp
     test_astype.cpp
     test_async_copy.cpp
-    test_sizeof.c
+    test_sizeof.cpp
     test_vector_creation.cpp
-    test_vec_type_hint.c
+    test_vec_type_hint.cpp
     test_numeric_constants.cpp
     test_constant_source.cpp
-    test_bufferreadwriterect.c
+    test_bufferreadwriterect.cpp
     test_async_strided_copy.cpp
     test_preprocessors.cpp
     test_kernel_memory_alignment.cpp
@@ -51,22 +51,22 @@ set(${MODULE_NAME}_SOURCES
     test_kernel_call_kernel_function.cpp
     test_local_kernel_scope.cpp
     test_progvar.cpp
-    test_wg_barrier.c
-    test_global_linear_id.c
-    test_local_linear_id.c
-    test_enqueued_local_size.c
-    test_simple_image_pitch.c
+    test_wg_barrier.cpp
+    test_global_linear_id.cpp
+    test_local_linear_id.cpp
+    test_enqueued_local_size.cpp
+    test_simple_image_pitch.cpp
     test_get_linear_ids.cpp
-    test_rw_image_access_qualifier.c
-    test_wg_barrier.c
-    test_enqueued_local_size.c
-    test_global_linear_id.c
-    test_local_linear_id.c
+    test_rw_image_access_qualifier.cpp
+    test_wg_barrier.cpp
+    test_enqueued_local_size.cpp
+    test_global_linear_id.cpp
+    test_local_linear_id.cpp
     test_progvar.cpp
 )
 
 if(APPLE)
-    list(APPEND ${MODULE_NAME}_SOURCES test_queue_priority.c)
+    list(APPEND ${MODULE_NAME}_SOURCES test_queue_priority.cpp)
 endif(APPLE)
 
 include(../CMakeCommon.txt)

test_conformance/buffers/CMakeLists.txt

@@ -1,17 +1,17 @@
 set(MODULE_NAME BUFFERS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_buffer_copy.c
-    test_buffer_read.c
-    test_buffer_write.c
-    test_buffer_mem.c
-    array_info.c
-    test_buffer_map.c
+    main.cpp
+    test_buffer_copy.cpp
+    test_buffer_read.cpp
+    test_buffer_write.cpp
+    test_buffer_mem.cpp
+    array_info.cpp
+    test_buffer_map.cpp
     test_sub_buffers.cpp
-    test_buffer_fill.c
-    test_buffer_migrate.c
-    test_image_migrate.c
+    test_buffer_fill.cpp
+    test_buffer_migrate.cpp
+    test_image_migrate.cpp
 )
 
 include(../CMakeCommon.txt)

test_conformance/commonfns/CMakeLists.txt

@@ -1,25 +1,25 @@
 set(MODULE_NAME COMMONFNS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_clamp.c
-    test_degrees.c
-    test_max.c
-    test_maxf.c
-    test_min.c
-    test_minf.c
-    test_mix.c
-    test_radians.c
-    test_step.c
-    test_stepf.c
-    test_smoothstep.c
-    test_smoothstepf.c
-    test_sign.c
-    test_fmax.c
-    test_fmin.c
-    test_fmaxf.c
-    test_fminf.c
-    test_binary_fn.c
+    main.cpp
+    test_clamp.cpp
+    test_degrees.cpp
+    test_max.cpp
+    test_maxf.cpp
+    test_min.cpp
+    test_minf.cpp
+    test_mix.cpp
+    test_radians.cpp
+    test_step.cpp
+    test_stepf.cpp
+    test_smoothstep.cpp
+    test_smoothstepf.cpp
+    test_sign.cpp
+    test_fmax.cpp
+    test_fmin.cpp
+    test_fmaxf.cpp
+    test_fminf.cpp
+    test_binary_fn.cpp
 )
 
 include(../CMakeCommon.txt)