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 5bffed2ab24c822c62e9667f999d9a8d7e0da09a (commit) via a4c73024b492b13af9cba813979934c65411dbfe (commit) from 7424ba51d70fd4ae25aa9521c256feef92ec4605 (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=5bffed2ab24c822c62e9667f999d9a8d7e0da09a commit 5bffed2ab24c822c62e9667f999d9a8d7e0da09a Merge: 7424ba5 a4c7302 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Tue Feb 18 10:24:13 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Feb 18 10:24:13 2014 -0500 Merge topic 'variable-expansion-tests' into next a4c73024 tests: Test parentheses in ENV variables http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4c73024b492b13af9cba813979934c65411dbfe commit a4c73024b492b13af9cba813979934c65411dbfe Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Tue Feb 18 10:23:47 2014 -0500 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Tue Feb 18 10:23:47 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) ----------------------------------------------------------------------- Summary of changes: .../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 | 2 ++ 6 files changed, 27 insertions(+) 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 hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits