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 6bfa75bcf843e512a18a28063fa8a6edd1633572 (commit)
via 5b7dec82e8820e6081b2aec5323437528b9c5720 (commit)
via 58326dd2dee8f53de79296c99f177b78bb5e6a85 (commit)
via 23872099f044159cb36633dc6c89d6dd5313635f (commit)
via fb1997fe639f4542a5c3e65eab84b1ecd2f459f5 (commit)
from 85c864253322b4d79d854e960239ae2a93705242 (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=6bfa75bcf843e512a18a28063fa8a6edd1633572
commit 6bfa75bcf843e512a18a28063fa8a6edd1633572
Merge: 85c8642 5b7dec8
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:32:53 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 12 18:32:53 2014 -0500
Merge topic 'variable-expansion-tests' into next
5b7dec82 tests: Add variable expansion test for @ONLY with empty expansions
58326dd2 tests: Make the file expansion more rigorous
23872099 tests: Comment variable_expansion test logic
fb1997fe tests: Test @ expansion when the variable is empty
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b7dec82e8820e6081b2aec5323437528b9c5720
commit 5b7dec82e8820e6081b2aec5323437528b9c5720
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:32:07 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 18:32:41 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=58326dd2dee8f53de79296c99f177b78bb5e6a85
commit 58326dd2dee8f53de79296c99f177b78bb5e6a85
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:30:26 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 18:32:41 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=23872099f044159cb36633dc6c89d6dd5313635f
commit 23872099f044159cb36633dc6c89d6dd5313635f
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:29:30 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 18:32:40 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=fb1997fe639f4542a5c3e65eab84b1ecd2f459f5
commit fb1997fe639f4542a5c3e65eab84b1ecd2f459f5
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Feb 12 18:18:25 2014 -0500
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Feb 12 18:18:25 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)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/variable_expansion/AtWithVariable.cmake | 3 +++
Tests/RunCMake/variable_expansion/AtWithVariableAtOnly.cmake | 2 ++
.../variable_expansion/AtWithVariableAtOnlyFile-stderr.txt | 5 ++++-
Tests/RunCMake/variable_expansion/AtWithVariableAtOnlyFile.cmake | 1 -
...eAtOnly-stderr.txt => AtWithVariableEmptyExpansion-stderr.txt} | 0
.../{AtWithVariable.cmake => AtWithVariableEmptyExpansion.cmake} | 4 +++-
...y-stderr.txt => AtWithVariableEmptyExpansionAtOnly-stderr.txt} | 0
...iableAtOnly.cmake => AtWithVariableEmptyExpansionAtOnly.cmake} | 4 +++-
Tests/RunCMake/variable_expansion/AtWithVariableFile-stderr.txt | 5 ++++-
Tests/RunCMake/variable_expansion/AtWithVariableFile.cmake | 1 -
Tests/RunCMake/variable_expansion/RunCMakeTest.cmake | 2 ++
Tests/RunCMake/variable_expansion/atfile.txt.in | 5 ++++-
12 files changed, 25 insertions(+), 7 deletions(-)
copy Tests/RunCMake/variable_expansion/{AtWithVariableAtOnly-stderr.txt =>
AtWithVariableEmptyExpansion-stderr.txt} (100%)
copy Tests/RunCMake/variable_expansion/{AtWithVariable.cmake =>
AtWithVariableEmptyExpansion.cmake} (63%)
copy Tests/RunCMake/variable_expansion/{AtWithVariableAtOnly-stderr.txt =>
AtWithVariableEmptyExpansionAtOnly-stderr.txt} (100%)
copy Tests/RunCMake/variable_expansion/{AtWithVariableAtOnly.cmake =>
AtWithVariableEmptyExpansionAtOnly.cmake} (61%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
