diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-08 14:35:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-08 14:35:26 (GMT) |
| commit | 0530eca631d5ddef6243c501db21e06f9fd15e43 (patch) | |
| tree | 6838787486f74914f7c9854060b692047ce77578 /Tests/RunCMake | |
| parent | 5b63ffe4cbc1266b81333499bd00302878b4fd52 (diff) | |
| parent | 06860d5c12ddc5ccf94b94c88861c6f0a8293f23 (diff) | |
| download | CMake-0530eca631d5ddef6243c501db21e06f9fd15e43.zip CMake-0530eca631d5ddef6243c501db21e06f9fd15e43.tar.gz CMake-0530eca631d5ddef6243c501db21e06f9fd15e43.tar.bz2 | |
Merge topic 'gtest-json-test-def-source'
06860d5c12 ctest: Show custom test properties in --show-only=json-v1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9305
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 715a5fa..a702dc2 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -393,6 +393,8 @@ function(run_ShowOnly) RESOURCE_GROUPS \"2,threads:2,gpus:4;gpus:2,threads:4\" REQUIRED_FILES RequiredFileDoesNotExist _BACKTRACE_TRIPLES \"file1;1;add_test;file0;;\" + USER_DEFINED_A \"User defined property A value\" + USER_DEFINED_B \"User defined property B value\" ) add_test(ShowOnlyNotAvailable NOT_AVAILABLE) ") diff --git a/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py b/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py index b818650..f9667ae 100644 --- a/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py +++ b/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py @@ -144,13 +144,23 @@ def check_workingdir_property(p): assert p["name"] == "WORKING_DIRECTORY" assert p["value"].endswith("Tests/RunCMake/CTestCommandLine/ShowOnly") +def check_defined_properties(p_list): + for property_id, p in zip(["A", "B"], p_list): + assert is_dict(p) + assert sorted(p.keys()) == ["name", "value"] + assert is_string(p["name"]) + assert is_string(p["value"]) + assert p["name"] == "USER_DEFINED_" + property_id + assert p["value"] == "User defined property " + property_id + " value" + def check_properties(p): assert is_list(p) - assert len(p) == 4 + assert len(p) == 6 check_resource_groups_property(p[0]) check_reqfiles_property(p[1]) check_willfail_property(p[2]) check_workingdir_property(p[3]) + check_defined_properties(p[4:5]) def check_tests(t): assert is_list(t) |