diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-08 17:55:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-08 17:55:25 (GMT) |
| commit | aaadc280c94dc8b08395616dfa3fec573076676f (patch) | |
| tree | f42c13c77a0289314c36d9adc8d7e9b61a5139e5 /Tests | |
| parent | d422ee362db7f742930de5b2fafd9a3c30c52ef0 (diff) | |
| parent | 6aa0c214054252d1fc94e5b8e6b6ffc3eae4c08b (diff) | |
| download | CMake-aaadc280c94dc8b08395616dfa3fec573076676f.zip CMake-aaadc280c94dc8b08395616dfa3fec573076676f.tar.gz CMake-aaadc280c94dc8b08395616dfa3fec573076676f.tar.bz2 | |
Merge topic 'dev/fix-variable-watch-crash'
6aa0c21 variable_watch: Add test for watching a variable multiple times
b86e37c variable_watch: Check newValue for NULL
f9bb20f variable_watch: Don't share memory for callbacks
05dad99 variable_watch: Fix a typo in the error message
00ce12a variable_watch: Prevent making extra entries in the watch map
34b397e variable_watch: Allow specifying the data to match in RemoveWatch
e43e207 variable_watch: Match client_data when finding duplicates
0d6acb1 variable_watch: Add a deleter for the client data
fc7c3b4 variable_watch: Store client data as pointers
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}") |