Merge pull request #2137 from RossBrunton/ross/smartmatch

Don't use empty match test files
oneapi-src · Sep 26, 2024 · a21a230 · a21a230
2 parents a8c5c49 + acb9ca3
commit a21a230
Show file tree

Hide file tree

Showing 48 changed files with 8 additions and 7 deletions.
diff --git a/test/conformance/CMakeLists.txt b/test/conformance/CMakeLists.txt
@@ -17,16 +17,17 @@ function(add_test_adapter name adapter)
     set(TEST_NAME ${name}-${adapter}${EXTRA_NAME})
 
     set(TEST_COMMAND
-        "${PROJECT_BINARY_DIR}/bin/${TEST_TARGET_NAME} --test_devices_count=${UR_TEST_DEVICES_COUNT} --test_platforms_count=${UR_TEST_PLATFORMS_COUNT}"
+        "${PROJECT_BINARY_DIR}/bin/${TEST_TARGET_NAME} --devices_count=${UR_TEST_DEVICES_COUNT} --platforms_count=${UR_TEST_PLATFORMS_COUNT}"
     )
+    set(MATCH_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${name}_${adapter}${EXTRA_NAME}.match")
 
-    if(UR_CONFORMANCE_ENABLE_MATCH_FILES)
+    if(${UR_CONFORMANCE_ENABLE_MATCH_FILES} AND EXISTS ${MATCH_FILE})
         add_test(NAME ${TEST_NAME}
             COMMAND ${CMAKE_COMMAND}
             -D TEST_FILE=${Python3_EXECUTABLE}
             -D TEST_ARGS="${UR_CONFORMANCE_TEST_DIR}/cts_exe.py --test_command ${TEST_COMMAND}"
             -D MODE=stdout
-            -D MATCH_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${name}_${adapter}${EXTRA_NAME}.match
+            -D MATCH_FILE=${MATCH_FILE}
             -P ${PROJECT_SOURCE_DIR}/cmake/match.cmake
             DEPENDS ${TEST_TARGET_NAME}
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/test/conformance/adapter/adapter_adapter_cuda.match b/test/conformance/adapter/adapter_adapter_cuda.match
diff --git a/test/conformance/adapter/adapter_adapter_hip.match b/test/conformance/adapter/adapter_adapter_hip.match
diff --git a/test/conformance/adapter/adapter_adapter_level_zero.match b/test/conformance/adapter/adapter_adapter_level_zero.match
diff --git a/test/conformance/adapter/adapter_adapter_level_zero_v2.match b/test/conformance/adapter/adapter_adapter_level_zero_v2.match
diff --git a/test/conformance/adapter/adapter_adapter_opencl.match b/test/conformance/adapter/adapter_adapter_opencl.match
diff --git a/test/conformance/context/context_adapter_cuda.match b/test/conformance/context/context_adapter_cuda.match
diff --git a/test/conformance/context/context_adapter_hip.match b/test/conformance/context/context_adapter_hip.match
diff --git a/test/conformance/context/context_adapter_opencl.match b/test/conformance/context/context_adapter_opencl.match
diff --git a/test/conformance/cts_exe.py b/test/conformance/cts_exe.py
@@ -21,13 +21,13 @@
 
     parser = ArgumentParser()
     parser.add_argument("--test_command", help="Ctest test case")
-    parser.add_argument("--test_devices_count", type=str, help="Number of devices on which tests will be run")
-    parser.add_argument("--test_platforms_count", type=str, help="Number of platforms on which tests will be run")
+    parser.add_argument("--devices_count", type=str, help="Number of devices on which tests will be run")
+    parser.add_argument("--platforms_count", type=str, help="Number of platforms on which tests will be run")
     args = parser.parse_args()
 
     result = subprocess.Popen([args.test_command, '--gtest_brief=1',        # nosec B603
-                               f'--devices_count={args.test_devices_count}',
-                               f'--platforms_count={args.test_platforms_count}'],
+                               f'--devices_count={args.devices_count}',
+                               f'--platforms_count={args.platforms_count}'],
                                stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
 
     pat = re.compile(r'\[( )*FAILED( )*\]')

diff --git a/test/conformance/event/event_adapter_opencl.match b/test/conformance/event/event_adapter_opencl.match
diff --git a/test/conformance/exp_command_buffer/exp_command_buffer_adapter_level_zero.match b/test/conformance/exp_command_buffer/exp_command_buffer_adapter_level_zero.match
diff --git a/test/conformance/exp_command_buffer/exp_command_buffer_adapter_opencl.match b/test/conformance/exp_command_buffer/exp_command_buffer_adapter_opencl.match
diff --git a/test/conformance/exp_enqueue_native/exp_enqueue_native_adapter_cuda.match b/test/conformance/exp_enqueue_native/exp_enqueue_native_adapter_cuda.match
diff --git a/test/conformance/exp_launch_properties/exp_launch_properties_adapter_cuda.match b/test/conformance/exp_launch_properties/exp_launch_properties_adapter_cuda.match
diff --git a/test/conformance/exp_launch_properties/exp_launch_properties_adapter_hip.match b/test/conformance/exp_launch_properties/exp_launch_properties_adapter_hip.match
diff --git a/test/conformance/exp_launch_properties/exp_launch_properties_adapter_level_zero.match b/test/conformance/exp_launch_properties/exp_launch_properties_adapter_level_zero.match
diff --git a/test/conformance/exp_launch_properties/exp_launch_properties_adapter_level_zero_v2.match b/test/conformance/exp_launch_properties/exp_launch_properties_adapter_level_zero_v2.match
diff --git a/test/conformance/exp_launch_properties/exp_launch_properties_adapter_opencl.match b/test/conformance/exp_launch_properties/exp_launch_properties_adapter_opencl.match
diff --git a/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_cuda.match b/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_cuda.match
diff --git a/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_hip.match b/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_hip.match
diff --git a/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_level_zero.match b/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_level_zero.match
diff --git a/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_level_zero_v2.match b/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_level_zero_v2.match
diff --git a/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_native_cpu.match b/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_native_cpu.match
diff --git a/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_opencl.match b/test/conformance/exp_usm_p2p/exp_usm_p2p_adapter_opencl.match
diff --git a/test/conformance/integration/integration_adapter_cuda.match b/test/conformance/integration/integration_adapter_cuda.match
diff --git a/test/conformance/integration/integration_adapter_hip.match b/test/conformance/integration/integration_adapter_hip.match
diff --git a/test/conformance/memory-migrate/memory-migrate_adapter_cuda.match b/test/conformance/memory-migrate/memory-migrate_adapter_cuda.match
diff --git a/test/conformance/memory-migrate/memory-migrate_adapter_hip.match b/test/conformance/memory-migrate/memory-migrate_adapter_hip.match
diff --git a/test/conformance/memory-migrate/memory-migrate_adapter_level_zero.match b/test/conformance/memory-migrate/memory-migrate_adapter_level_zero.match
diff --git a/test/conformance/memory-migrate/memory-migrate_adapter_level_zero_v2.match b/test/conformance/memory-migrate/memory-migrate_adapter_level_zero_v2.match
diff --git a/test/conformance/memory-migrate/memory-migrate_adapter_native_cpu.match b/test/conformance/memory-migrate/memory-migrate_adapter_native_cpu.match
diff --git a/test/conformance/memory-migrate/memory-migrate_adapter_opencl.match b/test/conformance/memory-migrate/memory-migrate_adapter_opencl.match
diff --git a/test/conformance/platform/platform_adapter_level_zero.match b/test/conformance/platform/platform_adapter_level_zero.match
diff --git a/test/conformance/platform/platform_adapter_level_zero_v2.match b/test/conformance/platform/platform_adapter_level_zero_v2.match
diff --git a/test/conformance/platform/platform_adapter_opencl.match b/test/conformance/platform/platform_adapter_opencl.match
diff --git a/test/conformance/queue/queue_adapter_cuda.match b/test/conformance/queue/queue_adapter_cuda.match
diff --git a/test/conformance/queue/queue_adapter_hip.match b/test/conformance/queue/queue_adapter_hip.match
diff --git a/test/conformance/queue/queue_adapter_level_zero_v2.match b/test/conformance/queue/queue_adapter_level_zero_v2.match
diff --git a/test/conformance/queue/queue_adapter_opencl.match b/test/conformance/queue/queue_adapter_opencl.match
diff --git a/test/conformance/sampler/sampler_adapter_cuda.match b/test/conformance/sampler/sampler_adapter_cuda.match
diff --git a/test/conformance/sampler/sampler_adapter_hip.match b/test/conformance/sampler/sampler_adapter_hip.match
diff --git a/test/conformance/sampler/sampler_adapter_native_cpu.match b/test/conformance/sampler/sampler_adapter_native_cpu.match
diff --git a/test/conformance/sampler/sampler_adapter_opencl.match b/test/conformance/sampler/sampler_adapter_opencl.match
diff --git a/test/conformance/virtual_memory/virtual_memory_adapter_cuda.match b/test/conformance/virtual_memory/virtual_memory_adapter_cuda.match
diff --git a/test/conformance/virtual_memory/virtual_memory_adapter_hip.match b/test/conformance/virtual_memory/virtual_memory_adapter_hip.match
diff --git a/test/conformance/virtual_memory/virtual_memory_adapter_native_cpu.match b/test/conformance/virtual_memory/virtual_memory_adapter_native_cpu.match
diff --git a/test/conformance/virtual_memory/virtual_memory_adapter_opencl.match b/test/conformance/virtual_memory/virtual_memory_adapter_opencl.match