From c011c4c64c12c470c02a2abe743cf30ff97fb1f7 Mon Sep 17 00:00:00 2001 From: jonawals Date: Wed, 19 May 2021 16:59:58 +0100 Subject: [PATCH] Address PR comments --- cmake/TestImpactFramework/ConsoleFrontendConfig.in | 10 +++++++--- cmake/TestImpactFramework/LYTestImpactFramework.cmake | 8 +++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmake/TestImpactFramework/ConsoleFrontendConfig.in b/cmake/TestImpactFramework/ConsoleFrontendConfig.in index 73e90ea0ce..f6af3d801d 100644 --- a/cmake/TestImpactFramework/ConsoleFrontendConfig.in +++ b/cmake/TestImpactFramework/ConsoleFrontendConfig.in @@ -9,12 +9,16 @@ "workspace": { "temp": { "root": "${temp_dir}", - "artifact_dir": "RuntimeArtifact" + "relative_paths": { + "artifact_dir": "RuntimeArtifact" + } }, "persistent": { "root": "${persistent_dir}", - "test_impact_data_file": "TestImpactData.spartia", - "enumeration_cache_dir": "EnumerationCache" + "relative_paths": { + "test_impact_data_file": "TestImpactData.spartia", + "enumeration_cache_dir": "EnumerationCache" + } } }, "artifacts": { diff --git a/cmake/TestImpactFramework/LYTestImpactFramework.cmake b/cmake/TestImpactFramework/LYTestImpactFramework.cmake index fc3ba0af44..c85b5ff1e9 100644 --- a/cmake/TestImpactFramework/LYTestImpactFramework.cmake +++ b/cmake/TestImpactFramework/LYTestImpactFramework.cmake @@ -99,7 +99,7 @@ endfunction() # \arg:TEST_NAME name of test function(ly_test_impact_extract_google_test COMPOSITE_TEST TEST_NAMESPACE TEST_NAME) get_property(test_components GLOBAL PROPERTY LY_ALL_TESTS_${COMPOSITE_TEST}_TEST_NAME) - # Namespace and test are mandetory + # Namespace and test are mandatory string(REPLACE "::" ";" test_components ${test_components}) list(LENGTH test_components num_test_components) if(num_test_components LESS 2) @@ -134,13 +134,11 @@ endfunction() #! ly_test_impact_extract_google_test_params: extracts the google test name and command parameters. # # \arg:COMPOSITE_TEST test in the form 'namespace::test' -# \arg:TEST_NAMESPACE namespace for the test # \arg:TEST_NAME name of test -# \arg:TEST_NAME optional command arguments to run the test -# \arg:TEST_NAME test timeout value +# \arg:TEST_COMMAND optional command arguments to run the test function(ly_test_impact_extract_google_test_params COMPOSITE_TEST TEST_NAME TEST_COMMAND) get_property(test_command GLOBAL PROPERTY LY_ALL_TESTS_${COMPOSITE_TEST}_TEST_COMMAND) - # Namespace and test are mandetory + # Namespace and test are mandatory string(REPLACE "::" ";" test_components ${COMPOSITE_TEST}) list(LENGTH test_components num_test_components) if(num_test_components LESS 2)