[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2769-g79386d8
Ben Boeckel
ben.boeckel at kitware.com
Mon May 5 16:54:52 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 79386d8516a11a0a86fd41f499aa397091497e7c (commit)
via 83477ff80c47f47b94feecf81ccdcb7a6400b141 (commit)
from afaf3a09711691fe44d73cfc0a09c466a19d2319 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79386d8516a11a0a86fd41f499aa397091497e7c
commit 79386d8516a11a0a86fd41f499aa397091497e7c
Merge: afaf3a0 83477ff
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon May 5 16:54:50 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 5 16:54:50 2014 -0400
Merge topic 'dev/faster-evis' into next
83477ff8 tests: more escaping tests for EVIS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83477ff80c47f47b94feecf81ccdcb7a6400b141
commit 83477ff80c47f47b94feecf81ccdcb7a6400b141
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon May 5 17:00:41 2014 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon May 5 17:00:41 2014 -0400
tests: more escaping tests for EVIS
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt
new file mode 100644
index 0000000..9575778
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CMP0053-NameWithCarriageReturn.cmake:2 \(message\):
+ message called with incorrect number of arguments
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake
new file mode 100644
index 0000000..b8a403d
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\rwith\rcarriagereturn})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake
new file mode 100644
index 0000000..bb0d93f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message("${var\rwith\rcarriagereturn}")
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt
new file mode 100644
index 0000000..41f86e6
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CMP0053-NameWithNewline.cmake:2 \(message\):
+ message called with incorrect number of arguments
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake
new file mode 100644
index 0000000..45b532e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message(${var\nwith\nnewline})
diff --git a/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake b/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake
new file mode 100644
index 0000000..6fe568d
--- /dev/null
+++ b/Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0053 NEW)
+message("${var\nwith\nnewline}")
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturn-result.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturn-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturn-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt
new file mode 100644
index 0000000..7448b59
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturn-stderr.txt
@@ -0,0 +1,12 @@
+^CMake Error at NameWithCarriageReturn.cmake:1 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake:1
+
+ when parsing string
+
+ \${var\\rwith\\rcarriagereturn}
+
+ syntax error, unexpected cal_SYMBOL, expecting } \(7\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake b/Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake
new file mode 100644
index 0000000..614f554
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake
@@ -0,0 +1 @@
+message(${var\rwith\rcarriagereturn})
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
new file mode 100644
index 0000000..97bc4b6
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
@@ -0,0 +1,12 @@
+^CMake Error at NameWithCarriageReturnQuoted.cmake:1 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake:1
+
+ when parsing string
+
+ \${var
with
carriagereturn}
+
+ syntax error, unexpected cal_SYMBOL, expecting } \(26\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
new file mode 100644
index 0000000..5378865
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
@@ -0,0 +1 @@
+message("${var
with
carriagereturn}")
diff --git a/Tests/RunCMake/Syntax/NameWithNewline-result.txt b/Tests/RunCMake/Syntax/NameWithNewline-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithNewline-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt b/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt
new file mode 100644
index 0000000..5cc111b
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithNewline-stderr.txt
@@ -0,0 +1,12 @@
+^CMake Error at NameWithNewline.cmake:1 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/NameWithNewline.cmake:1
+
+ when parsing string
+
+ \${var\\nwith\\nnewline}
+
+ syntax error, unexpected cal_SYMBOL, expecting } \(7\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/NameWithNewline.cmake b/Tests/RunCMake/Syntax/NameWithNewline.cmake
new file mode 100644
index 0000000..583bcb0
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithNewline.cmake
@@ -0,0 +1 @@
+message(${var\nwith\nnewline})
diff --git a/Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt b/Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithNewlineQuoted-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt
new file mode 100644
index 0000000..0067c2f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithNewlineQuoted-stderr.txt
@@ -0,0 +1,12 @@
+^CMake Error at NameWithNewlineQuoted.cmake:1 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake:1
+
+ when parsing string
+
+ \${var\\nwith\\nnewline}
+
+ syntax error, unexpected cal_SYMBOL, expecting } \(7\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake b/Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake
new file mode 100644
index 0000000..da6d2cf
--- /dev/null
+++ b/Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake
@@ -0,0 +1 @@
+message("${var\nwith\nnewline}")
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 53c8d6b..cecd338 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -86,17 +86,25 @@ run_cmake(ParenInQuotedENV)
# Variable name tests
run_cmake(NameWithSpaces)
run_cmake(NameWithTabs)
+run_cmake(NameWithNewline)
+run_cmake(NameWithCarriageReturn)
run_cmake(NameWithEscapedSpaces)
run_cmake(NameWithEscapedTabs)
run_cmake(NameWithSpacesQuoted)
run_cmake(NameWithTabsQuoted)
+run_cmake(NameWithNewlineQuoted)
+run_cmake(NameWithCarriageReturnQuoted)
run_cmake(NameWithEscapedSpacesQuoted)
run_cmake(NameWithEscapedTabsQuoted)
run_cmake(CMP0053-NameWithSpaces)
run_cmake(CMP0053-NameWithTabs)
+run_cmake(CMP0053-NameWithNewline)
+run_cmake(CMP0053-NameWithCarriageReturn)
run_cmake(CMP0053-NameWithEscapedSpaces)
run_cmake(CMP0053-NameWithEscapedTabs)
run_cmake(CMP0053-NameWithSpacesQuoted)
run_cmake(CMP0053-NameWithTabsQuoted)
+run_cmake(CMP0053-NameWithNewlineQuoted)
+run_cmake(CMP0053-NameWithCarriageReturnQuoted)
run_cmake(CMP0053-NameWithEscapedSpacesQuoted)
run_cmake(CMP0053-NameWithEscapedTabsQuoted)
-----------------------------------------------------------------------
Summary of changes:
.../CMP0053-NameWithCarriageReturn-result.txt} | 0
.../Syntax/CMP0053-NameWithCarriageReturn-stderr.txt | 4 ++++
Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake | 2 ++
.../Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake | 2 ++
.../CMP0053-NameWithNewline-result.txt} | 0
Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt | 4 ++++
Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake | 2 ++
Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake | 2 ++
.../NameWithCarriageReturn-result.txt} | 0
...Spaces-stderr.txt => NameWithCarriageReturn-stderr.txt} | 6 +++---
Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake | 1 +
.../NameWithCarriageReturnQuoted-result.txt} | 0
.../Syntax/NameWithCarriageReturnQuoted-stderr.txt | 12 ++++++++++++
Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake | 1 +
.../NameWithNewline-result.txt} | 0
...EscapedSpaces-stderr.txt => NameWithNewline-stderr.txt} | 6 +++---
Tests/RunCMake/Syntax/NameWithNewline.cmake | 1 +
.../NameWithNewlineQuoted-result.txt} | 0
...dSpaces-stderr.txt => NameWithNewlineQuoted-stderr.txt} | 6 +++---
Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake | 1 +
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 8 ++++++++
21 files changed, 49 insertions(+), 9 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithCarriageReturn-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturn.cmake
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithCarriageReturnQuoted.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/CMP0053-NameWithNewline-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewline-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewline.cmake
create mode 100644 Tests/RunCMake/Syntax/CMP0053-NameWithNewlineQuoted.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithCarriageReturn-result.txt} (100%)
copy Tests/RunCMake/Syntax/{NameWithEscapedSpaces-stderr.txt => NameWithCarriageReturn-stderr.txt} (54%)
create mode 100644 Tests/RunCMake/Syntax/NameWithCarriageReturn.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithCarriageReturnQuoted-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithNewline-result.txt} (100%)
copy Tests/RunCMake/Syntax/{NameWithEscapedSpaces-stderr.txt => NameWithNewline-stderr.txt} (54%)
create mode 100644 Tests/RunCMake/Syntax/NameWithNewline.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => Syntax/NameWithNewlineQuoted-result.txt} (100%)
copy Tests/RunCMake/Syntax/{NameWithEscapedSpaces-stderr.txt => NameWithNewlineQuoted-stderr.txt} (54%)
create mode 100644 Tests/RunCMake/Syntax/NameWithNewlineQuoted.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list