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 8f84ab9c4fe1d9b192d5795475c95988231dd3b1 (commit)
via db08bcc163150ac7f58fb66b1300b7236dea8d1b (commit)
from 047a12918207a0ce32a71fcfb7fb14f4233ebddd (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f84ab9c4fe1d9b192d5795475c95988231dd3b1
commit 8f84ab9c4fe1d9b192d5795475c95988231dd3b1
Merge: 047a129 db08bcc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Apr 18 10:25:17 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Apr 18 10:25:17 2016 -0400
Merge topic 'fix-addtest-and-crosscompiling-emulator-to-work-globally' into
next
db08bcc1 Revert "TestGenerator: Extend crosscompiling emulator test case"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db08bcc163150ac7f58fb66b1300b7236dea8d1b
commit db08bcc163150ac7f58fb66b1300b7236dea8d1b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Apr 18 10:25:03 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Apr 18 10:25:03 2016 -0400
Revert "TestGenerator: Extend crosscompiling emulator test case"
This reverts commit 7df92ec78dc22692f89a12ad6feec4e193c7edaa.
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest-check.cmake
b/Tests/RunCMake/CrosscompilingEmulator/AddTest-check.cmake
index 2dd6e85..0aae06c 100644
--- a/Tests/RunCMake/CrosscompilingEmulator/AddTest-check.cmake
+++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest-check.cmake
@@ -4,13 +4,9 @@ if(EXISTS "${testfile}")
else()
message(FATAL_ERROR "Could not find expected CTestTestfile.cmake.")
endif()
-set(error_details "There is a problem with generated test file: ${testfile}")
if(testfile_contents MATCHES "add_test[(]DoesNotUseEmulator
^(pseudo_emulator)+$")
- message(SEND_ERROR "Used emulator when it should not be used.
${error_details}")
+ message(SEND_ERROR "Used emulator when it should not be used.")
endif()
if(NOT testfile_contents MATCHES "add_test[(]UsesEmulator
.+pseudo_emulator.+$")
- message(SEND_ERROR "Did not use emulator when it should be used.
${error_details}")
-endif()
-if(NOT testfile_contents MATCHES
"add_test[(]UsesEmulatorWithExecTargetFromSubdirAddedWithoutGenex
.+pseudo_emulator.+$")
- message(SEND_ERROR "Did not use emulator when it should be used.
${error_details}")
+ message(SEND_ERROR "Did not use emulator when it should be used.")
endif()
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
index b6eacf1..41850f2 100644
--- a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
+++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
@@ -6,8 +6,3 @@ add_test(NAME DoesNotUseEmulator
add_executable(generated_exe simple_src.cxx)
add_test(NAME UsesEmulator
COMMAND generated_exe)
-
-add_subdirectory(AddTest)
-
-add_test(NAME UsesEmulatorWithExecTargetFromSubdirAddedWithoutGenex
- COMMAND generated_exe_in_subdir_added_to_test_without_genex)
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt
b/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt
deleted file mode 100644
index a10a694..0000000
--- a/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_executable(generated_exe_in_subdir_added_to_test_without_genex
${CMAKE_CURRENT_SOURCE_DIR}/../simple_src.cxx)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CrosscompilingEmulator/AddTest-check.cmake | 8 ++------
Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake | 5 -----
Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt | 1 -
3 files changed, 2 insertions(+), 12 deletions(-)
delete mode 100644 Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
