diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-08 17:35:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-08 17:35:15 (GMT) |
| commit | b93982fb640b7a7f4ebf53d19a44f615dd547636 (patch) | |
| tree | 530f3b476eb6d5a1fc94fbe8d2c4fa9520686ed8 /Tests | |
| parent | c50f7ede200e2a7cd02d59117ac93543b602885c (diff) | |
| parent | 6aa0c214054252d1fc94e5b8e6b6ffc3eae4c08b (diff) | |
| download | CMake-b93982fb640b7a7f4ebf53d19a44f615dd547636.zip CMake-b93982fb640b7a7f4ebf53d19a44f615dd547636.tar.gz CMake-b93982fb640b7a7f4ebf53d19a44f615dd547636.tar.bz2 | |
Merge branch 'dev/fix-variable-watch-crash' into cmake-syntax
Resolve conflict in Source/cmVariableWatchCommand.cxx by integrating the
changes from both sides.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/variable_watch/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/variable_watch/WatchTwice-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/variable_watch/WatchTwice.cmake | 11 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/variable_watch/RunCMakeTest.cmake b/Tests/RunCMake/variable_watch/RunCMakeTest.cmake index 8d20476..9becb4c 100644 --- a/Tests/RunCMake/variable_watch/RunCMakeTest.cmake +++ b/Tests/RunCMake/variable_watch/RunCMakeTest.cmake @@ -2,3 +2,4 @@ include(RunCMake) run_cmake(ModifiedAccess) run_cmake(NoWatcher) +run_cmake(WatchTwice) diff --git a/Tests/RunCMake/variable_watch/WatchTwice-stderr.txt b/Tests/RunCMake/variable_watch/WatchTwice-stderr.txt new file mode 100644 index 0000000..fa7d347 --- /dev/null +++ b/Tests/RunCMake/variable_watch/WatchTwice-stderr.txt @@ -0,0 +1,2 @@ +From watch1 +From watch2 diff --git a/Tests/RunCMake/variable_watch/WatchTwice.cmake b/Tests/RunCMake/variable_watch/WatchTwice.cmake new file mode 100644 index 0000000..540cfc1 --- /dev/null +++ b/Tests/RunCMake/variable_watch/WatchTwice.cmake @@ -0,0 +1,11 @@ +function (watch1) + message("From watch1") +endfunction () + +function (watch2) + message("From watch2") +endfunction () + +variable_watch(watched watch1) +variable_watch(watched watch2) +set(access "${watched}") |