[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7768-gc2bcd04
Ben Boeckel
ben.boeckel at kitware.com
Tue Feb 18 09:56:57 EST 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 c2bcd04025aac3a1b3fbee337fccdee894d5bc87 (commit)
via ffee803ea20216e1d7d1709c6e5d6008f3f10c22 (commit)
from d5bf45f8bfa3f10137b3d0819c826a4c318bc2a2 (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=c2bcd04025aac3a1b3fbee337fccdee894d5bc87
commit c2bcd04025aac3a1b3fbee337fccdee894d5bc87
Merge: d5bf45f ffee803
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Feb 18 09:56:56 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 18 09:56:56 2014 -0500
Merge topic 'variable-expansion-tests' into next
ffee803e tests: Move variable expansion into the Syntax test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffee803ea20216e1d7d1709c6e5d6008f3f10c22
commit ffee803ea20216e1d7d1709c6e5d6008f3f10c22
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Feb 18 09:56:30 2014 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Feb 18 09:56:30 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)
-----------------------------------------------------------------------
Summary of changes:
.../AtWithVariable-stderr.txt | 0
.../{variable_expansion => Syntax}/AtWithVariable.cmake | 0
.../AtWithVariableAtOnly-stderr.txt | 0
.../AtWithVariableAtOnly.cmake | 0
.../AtWithVariableAtOnlyFile-stderr.txt | 0
.../AtWithVariableAtOnlyFile.cmake | 0
.../AtWithVariableEmptyExpansion-stderr.txt | 0
.../AtWithVariableEmptyExpansion.cmake | 0
.../AtWithVariableEmptyExpansionAtOnly-stderr.txt | 0
.../AtWithVariableEmptyExpansionAtOnly.cmake | 0
.../AtWithVariableFile-stderr.txt | 0
.../{variable_expansion => Syntax}/AtWithVariableFile.cmake | 0
.../{variable_expansion => Syntax}/EscapeQuotes-stderr.txt | 0
.../{variable_expansion => Syntax}/EscapeQuotes.cmake | 0
.../{variable_expansion => Syntax}/EscapedAt-stderr.txt | 0
.../RunCMake/{variable_expansion => Syntax}/EscapedAt.cmake | 0
.../{variable_expansion => Syntax}/ExpandInAt-stderr.txt | 0
.../{variable_expansion => Syntax}/ExpandInAt.cmake | 0
Tests/RunCMake/Syntax/RunCMakeTest.cmake | 11 +++++++++++
Tests/RunCMake/{variable_expansion => Syntax}/atfile.txt.in | 0
Tests/RunCMake/variable_expansion/CMakeLists.txt | 3 ---
Tests/RunCMake/variable_expansion/RunCMakeTest.cmake | 11 -----------
22 files changed, 11 insertions(+), 14 deletions(-)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariable-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariable.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableAtOnly-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableAtOnly.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableAtOnlyFile-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableAtOnlyFile.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableEmptyExpansion-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableEmptyExpansion.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableEmptyExpansionAtOnly-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableEmptyExpansionAtOnly.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableFile-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/AtWithVariableFile.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/EscapeQuotes-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/EscapeQuotes.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/EscapedAt-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/EscapedAt.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/ExpandInAt-stderr.txt (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/ExpandInAt.cmake (100%)
rename Tests/RunCMake/{variable_expansion => Syntax}/atfile.txt.in (100%)
delete mode 100644 Tests/RunCMake/variable_expansion/CMakeLists.txt
delete mode 100644 Tests/RunCMake/variable_expansion/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list