From 5e0a644ee81b932f689f5f4c5456feb3e2af4e9a Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 12 Apr 2025 21:11:46 -0400 Subject: [PATCH] Tests/RunCMake/FileAPI: Explicitly specify expected reply index prefix --- Tests/RunCMake/FileAPI/ClientStateful-check.cmake | 2 +- Tests/RunCMake/FileAPI/ClientStateless-check.cmake | 2 +- Tests/RunCMake/FileAPI/DuplicateStateless-check.cmake | 2 +- Tests/RunCMake/FileAPI/Empty-check.cmake | 2 +- Tests/RunCMake/FileAPI/EmptyClient-check.cmake | 2 +- Tests/RunCMake/FileAPI/MixedStateless-check.cmake | 2 +- Tests/RunCMake/FileAPI/RunCMakeTest.cmake | 4 ++-- Tests/RunCMake/FileAPI/SharedStateless-check.cmake | 2 +- Tests/RunCMake/FileAPI/cache-v2-ClientStateful-check.cmake | 2 +- Tests/RunCMake/FileAPI/cache-v2-ClientStateless-check.cmake | 2 +- Tests/RunCMake/FileAPI/cache-v2-SharedStateless-check.cmake | 2 +- .../RunCMake/FileAPI/cmakeFiles-v1-ClientStateful-check.cmake | 2 +- .../FileAPI/cmakeFiles-v1-ClientStateless-check.cmake | 2 +- .../FileAPI/cmakeFiles-v1-SharedStateless-check.cmake | 2 +- .../RunCMake/FileAPI/codemodel-v2-ClientStateful-check.cmake | 2 +- .../RunCMake/FileAPI/codemodel-v2-ClientStateless-check.cmake | 2 +- .../RunCMake/FileAPI/codemodel-v2-SharedStateless-check.cmake | 2 +- .../FileAPI/configureLog-v1-ClientStateful-check.cmake | 2 +- .../FileAPI/configureLog-v1-ClientStateless-check.cmake | 2 +- .../FileAPI/configureLog-v1-SharedStateless-check.cmake | 2 +- .../RunCMake/FileAPI/toolchains-v1-ClientStateful-check.cmake | 2 +- .../FileAPI/toolchains-v1-ClientStateless-check.cmake | 2 +- .../FileAPI/toolchains-v1-SharedStateless-check.cmake | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Tests/RunCMake/FileAPI/ClientStateful-check.cmake b/Tests/RunCMake/FileAPI/ClientStateful-check.cmake index 1e9aab6d1d..e4a1bb2eb0 100644 --- a/Tests/RunCMake/FileAPI/ClientStateful-check.cmake +++ b/Tests/RunCMake/FileAPI/ClientStateful-check.cmake @@ -65,4 +65,4 @@ set(expect ) check_api("^${expect}$") -check_python(ClientStateful) +check_python(ClientStateful index) diff --git a/Tests/RunCMake/FileAPI/ClientStateless-check.cmake b/Tests/RunCMake/FileAPI/ClientStateless-check.cmake index 955d9bea43..5d06408ac5 100644 --- a/Tests/RunCMake/FileAPI/ClientStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/ClientStateless-check.cmake @@ -12,4 +12,4 @@ set(expect ) check_api("^${expect}$") -check_python(ClientStateless) +check_python(ClientStateless index) diff --git a/Tests/RunCMake/FileAPI/DuplicateStateless-check.cmake b/Tests/RunCMake/FileAPI/DuplicateStateless-check.cmake index 4959c1eaa0..e9c0438a6c 100644 --- a/Tests/RunCMake/FileAPI/DuplicateStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/DuplicateStateless-check.cmake @@ -17,4 +17,4 @@ set(expect ) check_api("^${expect}$") -check_python(DuplicateStateless) +check_python(DuplicateStateless index) diff --git a/Tests/RunCMake/FileAPI/Empty-check.cmake b/Tests/RunCMake/FileAPI/Empty-check.cmake index 2764b42977..47d94c9a2b 100644 --- a/Tests/RunCMake/FileAPI/Empty-check.cmake +++ b/Tests/RunCMake/FileAPI/Empty-check.cmake @@ -5,4 +5,4 @@ set(expect ) check_api("^${expect}$") -check_python(Empty) +check_python(Empty index) diff --git a/Tests/RunCMake/FileAPI/EmptyClient-check.cmake b/Tests/RunCMake/FileAPI/EmptyClient-check.cmake index 4e5745cdbf..918fee1e84 100644 --- a/Tests/RunCMake/FileAPI/EmptyClient-check.cmake +++ b/Tests/RunCMake/FileAPI/EmptyClient-check.cmake @@ -6,4 +6,4 @@ set(expect ) check_api("^${expect}$") -check_python(EmptyClient) +check_python(EmptyClient index) diff --git a/Tests/RunCMake/FileAPI/MixedStateless-check.cmake b/Tests/RunCMake/FileAPI/MixedStateless-check.cmake index 57956143eb..82f187b17b 100644 --- a/Tests/RunCMake/FileAPI/MixedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/MixedStateless-check.cmake @@ -13,4 +13,4 @@ set(expect ) check_api("^${expect}$") -check_python(MixedStateless) +check_python(MixedStateless index) diff --git a/Tests/RunCMake/FileAPI/RunCMakeTest.cmake b/Tests/RunCMake/FileAPI/RunCMakeTest.cmake index 81926af33a..12c61496d4 100644 --- a/Tests/RunCMake/FileAPI/RunCMakeTest.cmake +++ b/Tests/RunCMake/FileAPI/RunCMakeTest.cmake @@ -17,11 +17,11 @@ in directory: endif() endfunction() -function(check_python case) +function(check_python case prefix) if(RunCMake_TEST_FAILED OR NOT Python_EXECUTABLE) return() endif() - file(GLOB index ${RunCMake_TEST_BINARY_DIR}/.cmake/api/v1/reply/index-*.json) + file(GLOB index ${RunCMake_TEST_BINARY_DIR}/.cmake/api/v1/reply/${prefix}-*.json) execute_process( COMMAND ${Python_EXECUTABLE} "${RunCMake_SOURCE_DIR}/${case}-check.py" "${index}" "${CMAKE_CXX_COMPILER_ID}" "${RunCMake_TEST_BINARY_DIR}" diff --git a/Tests/RunCMake/FileAPI/SharedStateless-check.cmake b/Tests/RunCMake/FileAPI/SharedStateless-check.cmake index 7f3bb23dc3..498bce714a 100644 --- a/Tests/RunCMake/FileAPI/SharedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/SharedStateless-check.cmake @@ -12,4 +12,4 @@ set(expect ) check_api("^${expect}$") -check_python(SharedStateless) +check_python(SharedStateless index) diff --git a/Tests/RunCMake/FileAPI/cache-v2-ClientStateful-check.cmake b/Tests/RunCMake/FileAPI/cache-v2-ClientStateful-check.cmake index 0f5ef28a68..f7c9a73d97 100644 --- a/Tests/RunCMake/FileAPI/cache-v2-ClientStateful-check.cmake +++ b/Tests/RunCMake/FileAPI/cache-v2-ClientStateful-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(cache-v2) +check_python(cache-v2 index) diff --git a/Tests/RunCMake/FileAPI/cache-v2-ClientStateless-check.cmake b/Tests/RunCMake/FileAPI/cache-v2-ClientStateless-check.cmake index c406ec81b4..68e60d7001 100644 --- a/Tests/RunCMake/FileAPI/cache-v2-ClientStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/cache-v2-ClientStateless-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(cache-v2) +check_python(cache-v2 index) diff --git a/Tests/RunCMake/FileAPI/cache-v2-SharedStateless-check.cmake b/Tests/RunCMake/FileAPI/cache-v2-SharedStateless-check.cmake index f8337ebf5e..9059e13dfe 100644 --- a/Tests/RunCMake/FileAPI/cache-v2-SharedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/cache-v2-SharedStateless-check.cmake @@ -7,4 +7,4 @@ set(expect ) check_api("^${expect}$") -check_python(cache-v2) +check_python(cache-v2 index) diff --git a/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateful-check.cmake b/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateful-check.cmake index 21e931e7b2..bcb3fa1c21 100644 --- a/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateful-check.cmake +++ b/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateful-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(cmakeFiles-v1) +check_python(cmakeFiles-v1 index) diff --git a/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateless-check.cmake b/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateless-check.cmake index 2ce2e79e4b..0efa72ee75 100644 --- a/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/cmakeFiles-v1-ClientStateless-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(cmakeFiles-v1) +check_python(cmakeFiles-v1 index) diff --git a/Tests/RunCMake/FileAPI/cmakeFiles-v1-SharedStateless-check.cmake b/Tests/RunCMake/FileAPI/cmakeFiles-v1-SharedStateless-check.cmake index 6e3b49a5cc..287525d2ce 100644 --- a/Tests/RunCMake/FileAPI/cmakeFiles-v1-SharedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/cmakeFiles-v1-SharedStateless-check.cmake @@ -7,4 +7,4 @@ set(expect ) check_api("^${expect}$") -check_python(cmakeFiles-v1) +check_python(cmakeFiles-v1 index) diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateful-check.cmake b/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateful-check.cmake index 91cdf7ca19..aa6eeec5f3 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateful-check.cmake +++ b/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateful-check.cmake @@ -10,4 +10,4 @@ set(expect ) check_api("^${expect}$") -check_python(codemodel-v2) +check_python(codemodel-v2 index) diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateless-check.cmake b/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateless-check.cmake index 9aa9e4a2a1..1b475ae679 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/codemodel-v2-ClientStateless-check.cmake @@ -10,4 +10,4 @@ set(expect ) check_api("^${expect}$") -check_python(codemodel-v2) +check_python(codemodel-v2 index) diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-SharedStateless-check.cmake b/Tests/RunCMake/FileAPI/codemodel-v2-SharedStateless-check.cmake index 43d1a0b4e1..d6951d06e7 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-SharedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/codemodel-v2-SharedStateless-check.cmake @@ -9,4 +9,4 @@ set(expect ) check_api("^${expect}$") -check_python(codemodel-v2) +check_python(codemodel-v2 index) diff --git a/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateful-check.cmake b/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateful-check.cmake index bd4081c0df..2cc4a7bad1 100644 --- a/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateful-check.cmake +++ b/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateful-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(configureLog-v1) +check_python(configureLog-v1 index) diff --git a/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateless-check.cmake b/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateless-check.cmake index 7498dd5c15..7211c6af1d 100644 --- a/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/configureLog-v1-ClientStateless-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(configureLog-v1) +check_python(configureLog-v1 index) diff --git a/Tests/RunCMake/FileAPI/configureLog-v1-SharedStateless-check.cmake b/Tests/RunCMake/FileAPI/configureLog-v1-SharedStateless-check.cmake index 3e34be692f..61e7b8b719 100644 --- a/Tests/RunCMake/FileAPI/configureLog-v1-SharedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/configureLog-v1-SharedStateless-check.cmake @@ -7,4 +7,4 @@ set(expect ) check_api("^${expect}$") -check_python(configureLog-v1) +check_python(configureLog-v1 index) diff --git a/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateful-check.cmake b/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateful-check.cmake index ce38461be8..dc701de770 100644 --- a/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateful-check.cmake +++ b/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateful-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(toolchains-v1) +check_python(toolchains-v1 index) diff --git a/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateless-check.cmake b/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateless-check.cmake index 4676dd8ddc..08d0f61d93 100644 --- a/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/toolchains-v1-ClientStateless-check.cmake @@ -8,4 +8,4 @@ set(expect ) check_api("^${expect}$") -check_python(toolchains-v1) +check_python(toolchains-v1 index) diff --git a/Tests/RunCMake/FileAPI/toolchains-v1-SharedStateless-check.cmake b/Tests/RunCMake/FileAPI/toolchains-v1-SharedStateless-check.cmake index 8e83758f9d..721ca614af 100644 --- a/Tests/RunCMake/FileAPI/toolchains-v1-SharedStateless-check.cmake +++ b/Tests/RunCMake/FileAPI/toolchains-v1-SharedStateless-check.cmake @@ -7,4 +7,4 @@ set(expect ) check_api("^${expect}$") -check_python(toolchains-v1) +check_python(toolchains-v1 index)