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 64c4708d66d8b0588b8031f1e98697490165dd8a (commit)
via 3e1dcc0caded4cd23150fb8cf19c74496a649d2e (commit)
via 30ee04803a1511b8bae282b6426c400cb4c22ad9 (commit)
via ee7ecd6464535622e15dd33116efc83e421079e1 (commit)
via 207d801482373d6393780006b39237c27a51796d (commit)
via 1ee4d44aac5b4142d9afca41a3154594ee683488 (commit)
via bdd0297ed06911070cd0a09b5c19de6c571f9aaf (commit)
via dce601f8b66de0f02f4381df2708053c3180bcb5 (commit)
via 2836568f39e6859e6a55880714001ba22f3677e5 (commit)
via 44e684156d8d9f77cba721209b95420d08c70256 (commit)
via 4a8f6d2b8cbe2d5ec96c990b294b920712f38e00 (commit)
from 03217750b3317b8c076d3d4aacd7a5f6dd0d2867 (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=64c4708d66d8b0588b8031f1e98697490165dd8a
commit 64c4708d66d8b0588b8031f1e98697490165dd8a
Merge: 0321775 3e1dcc0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 19 10:18:41 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 19 10:18:41 2014 -0500
Merge topic 'variable-expansion-tests' into next
3e1dcc0c tests: Test parentheses in ENV variables
30ee0480 tests: Remove variable_expansion test reference
ee7ecd64 tests: Move variable expansion into the Syntax test
207d8014 tests: Add variable expansion test for @ONLY with empty expansions
1ee4d44a tests: Make the file expansion more rigorous
bdd0297e tests: Comment variable_expansion test logic
dce601f8 tests: Test @ expansion when the variable is empty
2836568f tests: Test @ expansion with variable references in it
44e68415 tests: Test string(CONFIGURE) expansion with escaped quotes
4a8f6d2b tests: Add variable expansion tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e1dcc0caded4cd23150fb8cf19c74496a649d2e
commit 3e1dcc0caded4cd23150fb8cf19c74496a649d2e
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Feb 18 10:23:47 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:03 2014 -0500
tests: Test parentheses in ENV variables
diff --git a/Tests/RunCMake/Syntax/ParenInENV-result.txt
b/Tests/RunCMake/Syntax/ParenInENV-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInENV-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
new file mode 100644
index 0000000..7ecfe11
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInENV-stderr.txt
@@ -0,0 +1,20 @@
+CMake Warning \(dev\) at CMakeLists.txt:3 \(include\):
+ Syntax Warning in cmake code at
+
+ .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2:21
+
+ Argument not separated from preceding token by whitespace.
+This warning is for project developers. Use -Wno-dev to suppress it.
+
+CMake Error at ParenInENV.cmake:2 \(message\):
+ Syntax error in cmake code at
+
+ .*/Tests/RunCMake/Syntax/ParenInENV.cmake:2
+
+ when parsing string
+
+ -->\$ENV{e
+
+ syntax error, unexpected \$end, expecting } \(9\)
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/Syntax/ParenInENV.cmake
b/Tests/RunCMake/Syntax/ParenInENV.cmake
new file mode 100644
index 0000000..148f726
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInENV.cmake
@@ -0,0 +1,2 @@
+set("ENV{e(x)}" value)
+message(-->$ENV{e(x)}<--)
diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
b/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
new file mode 100644
index 0000000..7020c7e
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
@@ -0,0 +1 @@
+-->value<--
diff --git a/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
b/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
new file mode 100644
index 0000000..6333717
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
@@ -0,0 +1,2 @@
+set("ENV{e(x)}" value)
+message("-->$ENV{e(x)}<--")
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 35bf7a7..dcabd8a 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -63,3 +63,5 @@ run_cmake(AtWithVariableAtOnly)
run_cmake(AtWithVariableEmptyExpansionAtOnly)
run_cmake(AtWithVariableFile)
run_cmake(AtWithVariableAtOnlyFile)
+run_cmake(ParenInENV)
+run_cmake(ParenInQuotedENV)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30ee04803a1511b8bae282b6426c400cb4c22ad9
commit 30ee04803a1511b8bae282b6426c400cb4c22ad9
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Feb 18 10:05:20 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:03 2014 -0500
tests: Remove variable_expansion test reference
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 49400a3..9bb097b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -117,5 +117,3 @@ add_RunCMake_test(CheckModules)
add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
-
-add_RunCMake_test(variable_expansion)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee7ecd6464535622e15dd33116efc83e421079e1
commit ee7ecd6464535622e15dd33116efc83e421079e1
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Feb 18 09:56:30 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:03 2014 -0500
tests: Move variable expansion into the Syntax test
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
b/Tests/RunCMake/Syntax/AtWithVariable-stderr.txt
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
rename to Tests/RunCMake/Syntax/AtWithVariable-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
b/Tests/RunCMake/Syntax/AtWithVariable.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariable.cmake
rename to Tests/RunCMake/Syntax/AtWithVariable.cmake
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
b/Tests/RunCMake/Syntax/AtWithVariableAtOnly-stderr.txt
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
rename to Tests/RunCMake/Syntax/AtWithVariableAtOnly-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
b/Tests/RunCMake/Syntax/AtWithVariableAtOnly.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
rename to Tests/RunCMake/Syntax/AtWithVariableAtOnly.cmake
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
b/Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile-stderr.txt
similarity index 100%
rename from
Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
rename to Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
b/Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
rename to Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile.cmake
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt
b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion-stderr.txt
similarity index 100%
rename from
Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt
rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion-stderr.txt
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion.cmake
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt
b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly-stderr.txt
similarity index 100%
rename from
Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt
rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly-stderr.txt
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake
b/Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly.cmake
similarity index 100%
rename from
Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake
rename to Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly.cmake
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
b/Tests/RunCMake/Syntax/AtWithVariableFile-stderr.txt
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
rename to Tests/RunCMake/Syntax/AtWithVariableFile-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
b/Tests/RunCMake/Syntax/AtWithVariableFile.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
rename to Tests/RunCMake/Syntax/AtWithVariableFile.cmake
diff --git a/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
b/Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt
similarity index 100%
rename from Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
rename to Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
b/Tests/RunCMake/Syntax/EscapeQuotes.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
rename to Tests/RunCMake/Syntax/EscapeQuotes.cmake
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
b/Tests/RunCMake/Syntax/EscapedAt-stderr.txt
similarity index 100%
rename from Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
rename to Tests/RunCMake/Syntax/EscapedAt-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt.cmake
b/Tests/RunCMake/Syntax/EscapedAt.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/EscapedAt.cmake
rename to Tests/RunCMake/Syntax/EscapedAt.cmake
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
b/Tests/RunCMake/Syntax/ExpandInAt-stderr.txt
similarity index 100%
rename from Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
rename to Tests/RunCMake/Syntax/ExpandInAt-stderr.txt
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
b/Tests/RunCMake/Syntax/ExpandInAt.cmake
similarity index 100%
rename from Tests/RunCMake/variable_expansion/ExpandInAt.cmake
rename to Tests/RunCMake/Syntax/ExpandInAt.cmake
diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
index 5f05cfc..35bf7a7 100644
--- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake
@@ -52,3 +52,14 @@ run_cmake(UnterminatedString)
run_cmake(UnterminatedBracket0)
run_cmake(UnterminatedBracket1)
run_cmake(UnterminatedBracketComment)
+
+# Variable expansion tests
+run_cmake(ExpandInAt)
+run_cmake(EscapedAt)
+run_cmake(EscapeQuotes)
+run_cmake(AtWithVariable)
+run_cmake(AtWithVariableEmptyExpansion)
+run_cmake(AtWithVariableAtOnly)
+run_cmake(AtWithVariableEmptyExpansionAtOnly)
+run_cmake(AtWithVariableFile)
+run_cmake(AtWithVariableAtOnlyFile)
diff --git a/Tests/RunCMake/variable_expansion/atfile.txt.in
b/Tests/RunCMake/Syntax/atfile.txt.in
similarity index 100%
rename from Tests/RunCMake/variable_expansion/atfile.txt.in
rename to Tests/RunCMake/Syntax/atfile.txt.in
diff --git a/Tests/RunCMake/variable_expansion/CMakeLists.txt
b/Tests/RunCMake/variable_expansion/CMakeLists.txt
deleted file mode 100644
index 12cd3c7..0000000
--- a/Tests/RunCMake/variable_expansion/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8.4)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
deleted file mode 100644
index 73af8ba..0000000
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-include(RunCMake)
-
-run_cmake(ExpandInAt)
-run_cmake(EscapedAt)
-run_cmake(EscapeQuotes)
-run_cmake(AtWithVariable)
-run_cmake(AtWithVariableEmptyExpansion)
-run_cmake(AtWithVariableAtOnly)
-run_cmake(AtWithVariableEmptyExpansionAtOnly)
-run_cmake(AtWithVariableFile)
-run_cmake(AtWithVariableAtOnlyFile)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=207d801482373d6393780006b39237c27a51796d
commit 207d801482373d6393780006b39237c27a51796d
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:32:07 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:03 2014 -0500
tests: Add variable expansion test for @ONLY with empty expansions
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt
new file mode 100644
index 0000000..cbd1be4
--- /dev/null
+++
b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly-stderr.txt
@@ -0,0 +1 @@
+-->\${right}<--
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake
new file mode 100644
index 0000000..b657506
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansionAtOnly.cmake
@@ -0,0 +1,8 @@
+# Literal since 'var' is not defined.
+set(ref "@var@")
+set(right "wrong")
+set(var "\${right}")
+
+# 'var' is dereferenced, but now 'right'
+string(CONFIGURE "${ref}" output @ONLY)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
index 22d3920..73af8ba 100644
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -6,5 +6,6 @@ run_cmake(EscapeQuotes)
run_cmake(AtWithVariable)
run_cmake(AtWithVariableEmptyExpansion)
run_cmake(AtWithVariableAtOnly)
+run_cmake(AtWithVariableEmptyExpansionAtOnly)
run_cmake(AtWithVariableFile)
run_cmake(AtWithVariableAtOnlyFile)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ee4d44aac5b4142d9afca41a3154594ee683488
commit 1ee4d44aac5b4142d9afca41a3154594ee683488
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:30:26 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:03 2014 -0500
tests: Make the file expansion more rigorous
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
index 4bb4ed3..90bffb6 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
@@ -1,2 +1,5 @@
--->\${right}
+-->==>\${right}<==
+==><==
+==>\${var}<==
+==>\${empty}<==
<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
index 4bb4ed3..43f029f 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
@@ -1,2 +1,5 @@
--->\${right}
+-->==>\${right}<==
+==><==
+==>\${right}<==
+==><==
<--
diff --git a/Tests/RunCMake/variable_expansion/atfile.txt.in
b/Tests/RunCMake/variable_expansion/atfile.txt.in
index 701b7ec..3775919 100644
--- a/Tests/RunCMake/variable_expansion/atfile.txt.in
+++ b/Tests/RunCMake/variable_expansion/atfile.txt.in
@@ -1 +1,4 @@
-@var@
+==>@var@<==
+==>@empty@<==
+==>${var}<==
+==>${empty}<==
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdd0297ed06911070cd0a09b5c19de6c571f9aaf
commit bdd0297ed06911070cd0a09b5c19de6c571f9aaf
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:29:30 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:02 2014 -0500
tests: Comment variable_expansion test logic
It's not obvious why there are differences between the tests when moving
some lines around. Also remove unused variables from the *File tests.
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
index 7d28af1..2bbf61d 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
+++ b/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
@@ -1,6 +1,9 @@
set(right "wrong")
set(var "\${right}")
+# Expanded here.
set(ref "@var@")
+# 'right' is dereferenced because 'var' was dereferenced when
+# assigning to 'ref' above.
string(CONFIGURE "${ref}" output)
message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
index 9b29a9b..e06484c 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
@@ -1,6 +1,8 @@
set(right "wrong")
set(var "\${right}")
+# Expanded here.
set(ref "@var@")
+# No dereference done at all.
string(CONFIGURE "${ref}" output @ONLY)
message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
index 4160be5..bdd7bcd 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
@@ -1,6 +1,5 @@
set(right "wrong")
set(var "\${right}")
-set(ref "@var@")
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/atfile.txt.in"
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
index fc25d56..840c7f0 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
@@ -1,6 +1,8 @@
+# Literal since 'var' is not defined.
set(ref "@var@")
set(right "wrong")
set(var "\${right}")
+# 'var' is dereferenced here.
string(CONFIGURE "${ref}" output)
message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
index dc93e1d..c709099 100644
--- a/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
@@ -1,6 +1,5 @@
set(right "wrong")
set(var "\${right}")
-set(ref "@var@")
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/atfile.txt.in"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dce601f8b66de0f02f4381df2708053c3180bcb5
commit dce601f8b66de0f02f4381df2708053c3180bcb5
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:18:25 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:02 2014 -0500
tests: Test @ expansion when the variable is empty
Yet another corner case to handle in any future parser rewrites.
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt
new file mode 100644
index 0000000..cbd1be4
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion-stderr.txt
@@ -0,0 +1 @@
+-->\${right}<--
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
new file mode 100644
index 0000000..fc25d56
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableEmptyExpansion.cmake
@@ -0,0 +1,6 @@
+set(ref "@var@")
+set(right "wrong")
+set(var "\${right}")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
index 832585e..22d3920 100644
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -4,6 +4,7 @@ run_cmake(ExpandInAt)
run_cmake(EscapedAt)
run_cmake(EscapeQuotes)
run_cmake(AtWithVariable)
+run_cmake(AtWithVariableEmptyExpansion)
run_cmake(AtWithVariableAtOnly)
run_cmake(AtWithVariableFile)
run_cmake(AtWithVariableAtOnlyFile)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2836568f39e6859e6a55880714001ba22f3677e5
commit 2836568f39e6859e6a55880714001ba22f3677e5
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:12:26 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:02 2014 -0500
tests: Test @ expansion with variable references in it
Yet another difference between string(CONFIGURE) and configure_file().
@ONLY makes sense, but string(CONFIGURE) will dereference the variable
as well while configure_file will not.
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
new file mode 100644
index 0000000..5dcd4d7
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariable-stderr.txt
@@ -0,0 +1 @@
+-->wrong<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
new file mode 100644
index 0000000..7d28af1
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariable.cmake
@@ -0,0 +1,6 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
new file mode 100644
index 0000000..cbd1be4
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly-stderr.txt
@@ -0,0 +1 @@
+-->\${right}<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
new file mode 100644
index 0000000..9b29a9b
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake
@@ -0,0 +1,6 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+string(CONFIGURE "${ref}" output @ONLY)
+message("-->${output}<--")
diff --git
a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
new file mode 100644
index 0000000..4bb4ed3
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile-stderr.txt
@@ -0,0 +1,2 @@
+-->\${right}
+<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
new file mode 100644
index 0000000..4160be5
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake
@@ -0,0 +1,10 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/atfile.txt.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt"
+ @ONLY)
+file(READ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
b/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
new file mode 100644
index 0000000..4bb4ed3
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt
@@ -0,0 +1,2 @@
+-->\${right}
+<--
diff --git a/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
b/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
new file mode 100644
index 0000000..dc93e1d
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake
@@ -0,0 +1,9 @@
+set(right "wrong")
+set(var "\${right}")
+set(ref "@var@")
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/atfile.txt.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt")
+file(READ "${CMAKE_CURRENT_BINARY_DIR}/atfile.txt" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
index aa6e0ca..832585e 100644
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -3,3 +3,7 @@ include(RunCMake)
run_cmake(ExpandInAt)
run_cmake(EscapedAt)
run_cmake(EscapeQuotes)
+run_cmake(AtWithVariable)
+run_cmake(AtWithVariableAtOnly)
+run_cmake(AtWithVariableFile)
+run_cmake(AtWithVariableAtOnlyFile)
diff --git a/Tests/RunCMake/variable_expansion/atfile.txt.in
b/Tests/RunCMake/variable_expansion/atfile.txt.in
new file mode 100644
index 0000000..701b7ec
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/atfile.txt.in
@@ -0,0 +1 @@
+@var@
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44e684156d8d9f77cba721209b95420d08c70256
commit 44e684156d8d9f77cba721209b95420d08c70256
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:10:57 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:02 2014 -0500
tests: Test string(CONFIGURE) expansion with escaped quotes
*sigh* Not at all intuitive. Without @ONLY, quotes get escaped, but lose
their escape when passing through the lex/yacc parser.
diff --git a/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
b/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
new file mode 100644
index 0000000..077272d
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapeQuotes-stderr.txt
@@ -0,0 +1 @@
+-->"<--
diff --git a/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
b/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
new file mode 100644
index 0000000..46d2b6f
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapeQuotes.cmake
@@ -0,0 +1,9 @@
+set(var "\"")
+set(ref "@var@")
+set(rref "\${var}")
+
+string(CONFIGURE "${ref}" output ESCAPE_QUOTES)
+message("-->${output}<--")
+
+string(CONFIGURE "${rref}" output ESCAPE_QUOTES)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
index 4bc28e0..aa6e0ca 100644
--- a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -2,3 +2,4 @@ include(RunCMake)
run_cmake(ExpandInAt)
run_cmake(EscapedAt)
+run_cmake(EscapeQuotes)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a8f6d2b8cbe2d5ec96c990b294b920712f38e00
commit 4a8f6d2b8cbe2d5ec96c990b294b920712f38e00
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Fri Feb 7 17:53:31 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 19 10:12:01 2014 -0500
tests: Add variable expansion tests
There are some corner cases in variable expansion which would be nice to
capture before going and rewriting the variable expansion code.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9bb097b..49400a3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -117,3 +117,5 @@ add_RunCMake_test(CheckModules)
add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
+
+add_RunCMake_test(variable_expansion)
diff --git a/Tests/RunCMake/variable_expansion/CMakeLists.txt
b/Tests/RunCMake/variable_expansion/CMakeLists.txt
new file mode 100644
index 0000000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
b/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
new file mode 100644
index 0000000..a51c0d3
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapedAt-stderr.txt
@@ -0,0 +1 @@
+-->\\n<--
diff --git a/Tests/RunCMake/variable_expansion/EscapedAt.cmake
b/Tests/RunCMake/variable_expansion/EscapedAt.cmake
new file mode 100644
index 0000000..1ced620
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/EscapedAt.cmake
@@ -0,0 +1,5 @@
+set(var "n")
+set(ref "\\@var@")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
b/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
new file mode 100644
index 0000000..5da8b60
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/ExpandInAt-stderr.txt
@@ -0,0 +1 @@
+-->@foo@<--
diff --git a/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
b/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
new file mode 100644
index 0000000..98f0277
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/ExpandInAt.cmake
@@ -0,0 +1,6 @@
+set("\${varname}" bar)
+set(var foo)
+set(ref "@\${var}@")
+
+string(CONFIGURE "${ref}" output)
+message("-->${output}<--")
diff --git a/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
new file mode 100644
index 0000000..4bc28e0
--- /dev/null
+++ b/Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
@@ -0,0 +1,4 @@
+include(RunCMake)
+
+run_cmake(ExpandInAt)
+run_cmake(EscapedAt)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/Syntax/AtWithVariable-stderr.txt | 1 +
Tests/RunCMake/Syntax/AtWithVariable.cmake | 9 +++++++++
.../Syntax/AtWithVariableAtOnly-stderr.txt | 1 +
Tests/RunCMake/Syntax/AtWithVariableAtOnly.cmake | 8 ++++++++
.../Syntax/AtWithVariableAtOnlyFile-stderr.txt | 5 +++++
.../RunCMake/Syntax/AtWithVariableAtOnlyFile.cmake | 9 +++++++++
.../Syntax/AtWithVariableEmptyExpansion-stderr.txt | 1 +
.../Syntax/AtWithVariableEmptyExpansion.cmake | 8 ++++++++
.../AtWithVariableEmptyExpansionAtOnly-stderr.txt | 1 +
.../AtWithVariableEmptyExpansionAtOnly.cmake | 8 ++++++++
.../RunCMake/Syntax/AtWithVariableFile-stderr.txt | 5 +++++
Tests/RunCMake/Syntax/AtWithVariableFile.cmake | 8 ++++++++
Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt | 1 +
Tests/RunCMake/Syntax/EscapeQuotes.cmake | 9 +++++++++
Tests/RunCMake/Syntax/EscapedAt-stderr.txt | 1 +
Tests/RunCMake/Syntax/EscapedAt.cmake | 5 +++++
Tests/RunCMake/Syntax/ExpandInAt-stderr.txt | 1 +
Tests/RunCMake/Syntax/ExpandInAt.cmake | 6 ++++++
.../ParenInENV-result.txt} | 0
Tests/RunCMake/Syntax/ParenInENV-stderr.txt | 20 ++++++++++++++++++++
Tests/RunCMake/Syntax/ParenInENV.cmake | 2 ++
Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt | 1 +
Tests/RunCMake/Syntax/ParenInQuotedENV.cmake | 2 ++
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 13 +++++++++++++
Tests/RunCMake/Syntax/atfile.txt.in | 4 ++++
25 files changed, 129 insertions(+)
create mode 100644 Tests/RunCMake/Syntax/AtWithVariable-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/AtWithVariable.cmake
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableAtOnly-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableAtOnly.cmake
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableAtOnlyFile.cmake
create mode 100644
Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableEmptyExpansion.cmake
create mode 100644
Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly-stderr.txt
create mode 100644
Tests/RunCMake/Syntax/AtWithVariableEmptyExpansionAtOnly.cmake
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableFile-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/AtWithVariableFile.cmake
create mode 100644 Tests/RunCMake/Syntax/EscapeQuotes-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/EscapeQuotes.cmake
create mode 100644 Tests/RunCMake/Syntax/EscapedAt-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/EscapedAt.cmake
create mode 100644 Tests/RunCMake/Syntax/ExpandInAt-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ExpandInAt.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
Syntax/ParenInENV-result.txt} (100%)
create mode 100644 Tests/RunCMake/Syntax/ParenInENV-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenInENV.cmake
create mode 100644 Tests/RunCMake/Syntax/ParenInQuotedENV-stderr.txt
create mode 100644 Tests/RunCMake/Syntax/ParenInQuotedENV.cmake
create mode 100644 Tests/RunCMake/Syntax/atfile.txt.in
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
