diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-27 13:43:20 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-27 09:43:39 -0400 |
| commit | ab8801157917c574236ee472e864408405cb83cc (patch) | |
| tree | 20ebd7ca40df3f65f53f209a2887b835a3f3f14f /Tests/RunCMake | |
| parent | 5eab7ea84bf2549eb14877fd148f54ecfb9e1b75 (diff) | |
| parent | 7ecbe324b0ef02f63676f8431dbbbe8b4217f64f (diff) | |
| download | cmake-ab8801157917c574236ee472e864408405cb83cc.tar.gz | |
Merge topic 'cmake-presets-workflow-arguments'
7ecbe324b0 cmake --workflow: add --fresh option
7d9aa0f00c cmake::Workflow: Refactor to use enum class argument
322193afcd cmake --workflow: print usage and exit on unrecognized argument
70aef29427 cmake --workflow: print usage message
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7825
Diffstat (limited to 'Tests/RunCMake')
6 files changed, 46 insertions, 3 deletions
diff --git a/Tests/RunCMake/CMakePresetsWorkflow/Fresh.cmake b/Tests/RunCMake/CMakePresetsWorkflow/Fresh.cmake new file mode 100644 index 0000000000..4cf999f339 --- /dev/null +++ b/Tests/RunCMake/CMakePresetsWorkflow/Fresh.cmake @@ -0,0 +1,4 @@ +option(FRESH_CONFIGURE "" ON) +if(NOT FRESH_CONFIGURE) + message(FATAL_ERROR "FRESH_CONFIGURE is ${FRESH_CONFIGURE}, should be ON") +endif() diff --git a/Tests/RunCMake/CMakePresetsWorkflow/Fresh.json.in b/Tests/RunCMake/CMakePresetsWorkflow/Fresh.json.in new file mode 100644 index 0000000000..4ce0ca5554 --- /dev/null +++ b/Tests/RunCMake/CMakePresetsWorkflow/Fresh.json.in @@ -0,0 +1,21 @@ +{ + "version": 6, + "configurePresets": [ + { + "name": "default", + "generator": "@RunCMake_GENERATOR@", + "binaryDir": "${sourceDir}/build" + } + ], + "workflowPresets": [ + { + "name": "Fresh", + "steps": [ + { + "type": "configure", + "name": "default" + } + ] + } + ] +} diff --git a/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-result.txt b/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-result.txt new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-stderr.txt b/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-stderr.txt new file mode 100644 index 0000000000..049ff54c8a --- /dev/null +++ b/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-stderr.txt @@ -0,0 +1,6 @@ +^Unknown argument -DINVALID_OPTION +Usage: cmake --workflow \[options\] +Options: + --preset <preset> = Workflow preset to execute\. + --list-presets = List available workflow presets\. + --fresh = Configure a fresh build tree, removing any existing cache file\.$ diff --git a/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-stdout.txt b/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-stdout.txt new file mode 100644 index 0000000000..10f32932ee --- /dev/null +++ b/Tests/RunCMake/CMakePresetsWorkflow/InvalidOption-stdout.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake index b89a11a6af..550600a185 100644 --- a/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake +++ b/Tests/RunCMake/CMakePresetsWorkflow/RunCMakeTest.cmake @@ -10,10 +10,12 @@ function(run_cmake_workflow_presets name) set(RunCMake_TEST_BINARY_DIR "${RunCMake_TEST_SOURCE_DIR}/build") set(RunCMake_TEST_COMMAND_WORKING_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}") - set(RunCMake_TEST_NO_CLEAN TRUE) + if(NOT RunCMake_TEST_NO_CLEAN) + file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}") + file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}") + endif() - file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}") - file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}") + set(RunCMake_TEST_NO_CLEAN TRUE) set(CASE_NAME "${name}") set(CASE_SOURCE_DIR "${RunCMake_SOURCE_DIR}") @@ -77,3 +79,11 @@ unset(CMakeUserPresets_FILE) unset(CMakePresets_ASSETS) run_cmake_workflow_presets(ListPresets --list-presets) +run_cmake_workflow_presets(InvalidOption -DINVALID_OPTION) + +set(RunCMake_TEST_NO_CLEAN TRUE) +file(REMOVE_RECURSE "${RunCMake_BINARY_DIR}/Fresh") +file(MAKE_DIRECTORY "${RunCMake_BINARY_DIR}/Fresh/build") +file(WRITE "${RunCMake_BINARY_DIR}/Fresh/build/CMakeCache.txt" "FRESH_CONFIGURE:BOOL=OFF\n") +run_cmake_workflow_presets(Fresh --fresh) +unset(RunCMake_TEST_NO_CLEAN) |