[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2292-gf189046
Brad King
brad.king at kitware.com
Fri Feb 22 08:46:24 EST 2013
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 f189046f9d5e74c74c6ee4ee995ef2d9e1742e4e (commit)
via 8a1f13c32638d92945a88258f4d8d6cc1b1ba8ee (commit)
from 62c21a505a46c2380bad1a75b0cd660e5bf5b096 (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=f189046f9d5e74c74c6ee4ee995ef2d9e1742e4e
commit f189046f9d5e74c74c6ee4ee995ef2d9e1742e4e
Merge: 62c21a5 8a1f13c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 22 08:46:22 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 22 08:46:22 2013 -0500
Merge topic 'FPHSA_FOUND_VAR_OPTION' into next
8a1f13c FPHSA: Convert FOUND_VAR failure test to RunCMake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a1f13c32638d92945a88258f4d8d6cc1b1ba8ee
commit 8a1f13c32638d92945a88258f4d8d6cc1b1ba8ee
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 22 08:44:13 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 22 08:45:03 2013 -0500
FPHSA: Convert FOUND_VAR failure test to RunCMake
Move the Tests/FPHSA_InvalidFOUND_VAR test case over to a new
RunCMake.FPHSA test with a BadFoundVar case. The RunCMake tests are
built to cover failure cases easily and robustly.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2725202..f8e4afd 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -147,9 +147,6 @@ if(BUILD_TESTING)
# add a bunch of standard build-and-test style tests
ADD_TEST_MACRO(CommandLineTest CommandLineTest)
ADD_TEST_MACRO(FindPackageTest FindPackageTest)
- ADD_TEST_MACRO(FPHSA_InvalidFOUND_VAR FPHSA_InvalidFOUND_VAR)
- set_tests_properties(FPHSA_InvalidFOUND_VAR PROPERTIES
- PASS_REGULAR_EXPRESSION "The argument for FOUND_VAR is .badfoundvar_FOUND., but only")
ADD_TEST_MACRO(FindModulesExecuteAll FindModulesExecuteAll)
ADD_TEST_MACRO(StringFileTest StringFileTest)
ADD_TEST_MACRO(TryCompile TryCompile)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c55bb3a..dba772d 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -56,6 +56,7 @@ if(UNIX AND "${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles")
add_RunCMake_test(CompilerChange)
endif()
add_RunCMake_test(ExternalData)
+add_RunCMake_test(FPHSA)
add_RunCMake_test(GeneratorExpression)
add_RunCMake_test(GeneratorToolset)
add_RunCMake_test(TargetPropertyGeneratorExpressions)
diff --git a/Tests/RunCMake/FPHSA/BadFoundVar-result.txt b/Tests/RunCMake/FPHSA/BadFoundVar-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/BadFoundVar-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt b/Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt
new file mode 100644
index 0000000..d9e9a21
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt
@@ -0,0 +1,7 @@
+CMake Error at .*/CMake/Modules/FindPackageHandleStandardArgs.cmake:[0-9]+ \(message\):
+ The argument for FOUND_VAR is "badfoundvar_FOUND", but only
+ "BadFoundVar_FOUND" and "BADFOUNDVAR_FOUND" are valid names.
+Call Stack \(most recent call first\):
+ FindBadFoundVar.cmake:5 \(find_package_handle_standard_args\)
+ BadFoundVar.cmake:3 \(find_package\)
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/FPHSA_InvalidFOUND_VAR/CMakeLists.txt b/Tests/RunCMake/FPHSA/BadFoundVar.cmake
similarity index 70%
rename from Tests/FPHSA_InvalidFOUND_VAR/CMakeLists.txt
rename to Tests/RunCMake/FPHSA/BadFoundVar.cmake
index 6a88cf5..07d4322 100644
--- a/Tests/FPHSA_InvalidFOUND_VAR/CMakeLists.txt
+++ b/Tests/RunCMake/FPHSA/BadFoundVar.cmake
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.8)
-
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
find_package(BadFoundVar REQUIRED)
diff --git a/Tests/RunCMake/FPHSA/CMakeLists.txt b/Tests/RunCMake/FPHSA/CMakeLists.txt
new file mode 100644
index 0000000..e8db6b0
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/FPHSA_InvalidFOUND_VAR/FindBadFoundVar.cmake b/Tests/RunCMake/FPHSA/FindBadFoundVar.cmake
similarity index 100%
rename from Tests/FPHSA_InvalidFOUND_VAR/FindBadFoundVar.cmake
rename to Tests/RunCMake/FPHSA/FindBadFoundVar.cmake
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
new file mode 100644
index 0000000..0d48fa9
--- /dev/null
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(BadFoundVar)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 3 ---
Tests/RunCMake/CMakeLists.txt | 1 +
.../BadFoundVar-result.txt} | 0
Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt | 7 +++++++
.../FPHSA/BadFoundVar.cmake} | 2 --
Tests/RunCMake/{CMP0004 => FPHSA}/CMakeLists.txt | 0
.../FPHSA}/FindBadFoundVar.cmake | 0
Tests/RunCMake/FPHSA/RunCMakeTest.cmake | 3 +++
8 files changed, 11 insertions(+), 5 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => FPHSA/BadFoundVar-result.txt} (100%)
create mode 100644 Tests/RunCMake/FPHSA/BadFoundVar-stderr.txt
rename Tests/{FPHSA_InvalidFOUND_VAR/CMakeLists.txt => RunCMake/FPHSA/BadFoundVar.cmake} (70%)
copy Tests/RunCMake/{CMP0004 => FPHSA}/CMakeLists.txt (100%)
rename Tests/{FPHSA_InvalidFOUND_VAR => RunCMake/FPHSA}/FindBadFoundVar.cmake (100%)
create mode 100644 Tests/RunCMake/FPHSA/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list