diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-29 13:04:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-29 13:04:59 (GMT) |
| commit | 18153217e27d2cf560d874313557ec9fa2bcffdb (patch) | |
| tree | 5ac3c0c076a3c6be4f8fcd9607106bbfccaa9b73 /Tests | |
| parent | a271286f417731916cd60c546665ec030bc5b2c7 (diff) | |
| parent | 13347740e2fe00ad51493c89087f1bbbc35b224c (diff) | |
| download | CMake-18153217e27d2cf560d874313557ec9fa2bcffdb.zip CMake-18153217e27d2cf560d874313557ec9fa2bcffdb.tar.gz CMake-18153217e27d2cf560d874313557ec9fa2bcffdb.tar.bz2 | |
Merge topic 'ctest_start_function_scope'
13347740 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior
74092d92 cmCTestScriptHandler: Add new field ShouldRunCurrentScript
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1703
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/ctest_start/FunctionScope-stdout.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_start/RunCMakeTest.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_start/test.cmake.in | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Tests/RunCMake/ctest_start/FunctionScope-stdout.txt b/Tests/RunCMake/ctest_start/FunctionScope-stdout.txt new file mode 100644 index 0000000..10f3293 --- /dev/null +++ b/Tests/RunCMake/ctest_start/FunctionScope-stdout.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake index d630a79..bf47256 100644 --- a/Tests/RunCMake/ctest_start/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_start/RunCMakeTest.cmake @@ -11,6 +11,8 @@ run_ctest_start(StartQuiet Experimental QUIET) run_ctest_start(ConfigInSource Experimental) +run_ctest_start(FunctionScope Experimental QUIET) + function(run_ConfigInBuild) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ConfigInBuild-build) set(RunCMake_TEST_NO_CLEAN 1) diff --git a/Tests/RunCMake/ctest_start/test.cmake.in b/Tests/RunCMake/ctest_start/test.cmake.in index 21e3fad..0a27942 100644 --- a/Tests/RunCMake/ctest_start/test.cmake.in +++ b/Tests/RunCMake/ctest_start/test.cmake.in @@ -9,5 +9,13 @@ set(CTEST_CMAKE_GENERATOR_PLATFORM "@RunCMake_GENERATOR_PLATFORM@") set(CTEST_CMAKE_GENERATOR_TOOLSET "@RunCMake_GENERATOR_TOOLSET@") set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") +function(setup_tests) + ctest_start(${ctest_start_args}) +endfunction() + set(ctest_start_args "@CASE_CTEST_START_ARGS@") -ctest_start(${ctest_start_args}) +if("@CASE_NAME@" STREQUAL "FunctionScope") + setup_tests() +else() + ctest_start(${ctest_start_args}) +endif() |