summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-17 10:47:36 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-17 10:47:42 (GMT)
commit1aa16906e69499a48e3624842d241b957b48a1cb (patch)
tree33bfd7254668024ecc3f1718ec2d8502fafcc006 /Tests
parent3cb0cb9b09a9649d0657a223275cf4268273d26a (diff)
parentc017098d4d06ba114085ba7de47b99fc0b71e8d0 (diff)
downloadCMake-1aa16906e69499a48e3624842d241b957b48a1cb.zip
CMake-1aa16906e69499a48e3624842d241b957b48a1cb.tar.gz
CMake-1aa16906e69499a48e3624842d241b957b48a1cb.tar.bz2
Merge topic 'fix-flow-control-override'
c017098d4d CMake: Allow override of unexpected non-flow-control commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6232
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/Syntax/OverrideProject-result.txt1
-rw-r--r--Tests/RunCMake/Syntax/OverrideProject-stderr.txt3
-rw-r--r--Tests/RunCMake/Syntax/RunCMakeTest.cmake1
3 files changed, 5 insertions, 0 deletions
diff --git a/Tests/RunCMake/Syntax/OverrideProject-result.txt b/Tests/RunCMake/Syntax/OverrideProject-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/OverrideProject-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/OverrideProject-stderr.txt b/Tests/RunCMake/Syntax/OverrideProject-stderr.txt
new file mode 100644
index 0000000..862d5c8
--- /dev/null
+++ b/Tests/RunCMake/Syntax/OverrideProject-stderr.txt
@@ -0,0 +1,3 @@
+^CMake Error at [^
+]*/Tests/RunCMake/Syntax/Override\.cmake:[0-9]+ \(message\):
+ This shouldn't happen$
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 4d24657..f0c287c 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -150,3 +150,4 @@ run_override(If)
run_override(Macro)
run_override(Return)
run_override(While)
+run_override(Project)