summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-30 14:25:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-30 14:25:32 (GMT)
commit6e900fbe6970981f8c73500581df99fa6b955fa1 (patch)
tree6b52e7ecd7d750b5bf9caf87889d5f318b9ef119
parent4abe0ec21191c14748075259f085a4e05895f6bc (diff)
parent8640e5297911df98521b2b835aa1c024adbf845e (diff)
downloadCMake-6e900fbe6970981f8c73500581df99fa6b955fa1.zip
CMake-6e900fbe6970981f8c73500581df99fa6b955fa1.tar.gz
CMake-6e900fbe6970981f8c73500581df99fa6b955fa1.tar.bz2
Merge topic 'cmake-syntax-test-escaped-comment'
8640e52 Add to RunCMake.Syntax test \-escape cases 144068e Add to RunCMake.Syntax test comments not separated by spaces
-rw-r--r--Tests/RunCMake/Syntax/BracketComment5.cmake5
-rw-r--r--Tests/RunCMake/Syntax/Escape1-stderr.txt3
-rw-r--r--Tests/RunCMake/Syntax/Escape1.cmake3
-rw-r--r--Tests/RunCMake/Syntax/RunCMakeTest.cmake1
4 files changed, 12 insertions, 0 deletions
diff --git a/Tests/RunCMake/Syntax/BracketComment5.cmake b/Tests/RunCMake/Syntax/BracketComment5.cmake
index bb6d9f3..dc9e6b4 100644
--- a/Tests/RunCMake/Syntax/BracketComment5.cmake
+++ b/Tests/RunCMake/Syntax/BracketComment5.cmake
@@ -2,5 +2,10 @@
message(FATAL_ERROR "This is commented out.")
#]] #[[
message(FATAL_ERROR "This is commented out.")
+#]]#[[
+message(FATAL_ERROR "This is commented out.")
#]] #message(FATAL_ERROR "This is commented out.")
+#[[
+message(FATAL_ERROR "This is commented out.")
+#]]#message(FATAL_ERROR "This is commented out.")
message(STATUS "The above FATAL_ERROR did not occur.")
diff --git a/Tests/RunCMake/Syntax/Escape1-stderr.txt b/Tests/RunCMake/Syntax/Escape1-stderr.txt
new file mode 100644
index 0000000..6601ce7
--- /dev/null
+++ b/Tests/RunCMake/Syntax/Escape1-stderr.txt
@@ -0,0 +1,3 @@
+^\\##\[\[#\]\]#\[\[\]\]x#\\"
+\$\@\^\\; \(\)#\\"
+\$\@\^; \(\)$
diff --git a/Tests/RunCMake/Syntax/Escape1.cmake b/Tests/RunCMake/Syntax/Escape1.cmake
new file mode 100644
index 0000000..3bf801e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/Escape1.cmake
@@ -0,0 +1,3 @@
+message([[\#]] \#[[ \#]] "#[[]]" x#comment
+ "\#\\\"\n\$\@\^\;\ \t\(\)"#comment
+ \#\\\"\n\$\@\^\;\ \t\(\))
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 2d49f76..4f42a07 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -39,6 +39,7 @@ run_cmake(BracketNoSpace2)
run_cmake(BracketNoSpace3)
run_cmake(BracketNoSpace4)
run_cmake(BracketNoSpace5)
+run_cmake(Escape1)
run_cmake(ParenNoSpace0)
run_cmake(ParenNoSpace1)
run_cmake(ParenNoSpace2)