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 b82ae22bf8d81ce4abfe340c52fdde41e9fe3776 (commit)
via 55653c8be853c2bcbae9595dcf278fa27e2cf37e (commit)
from 239d0e025739f5885d49304e93fc896aa27928ba (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=b82ae22bf8d81ce4abfe340c52fdde41e9fe3776
commit b82ae22bf8d81ce4abfe340c52fdde41e9fe3776
Merge: 239d0e0 55653c8
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 30 16:15:29 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 30 16:15:29 2015 -0400
Merge topic 'cpack-tests-fix' into next
55653c8b CPack: fix TGZ test missing compiler errors
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55653c8be853c2bcbae9595dcf278fa27e2cf37e
commit 55653c8be853c2bcbae9595dcf278fa27e2cf37e
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Wed Sep 30 22:13:12 2015 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Wed Sep 30 22:13:12 2015 +0200
CPack: fix TGZ test missing compiler errors
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 7ea2a24..153ff50 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -10,47 +10,14 @@ function(run_cpack_test TEST_NAME types build)
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
# execute cmake
- execute_process(
- COMMAND "${CMAKE_COMMAND}" -DRunCMake_TEST=${TEST_NAME}
- -DGENERATOR_TYPE=${TEST_TYPE} "${RunCMake_SOURCE_DIR}"
- WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}"
- RESULT_VARIABLE res
- OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
- ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
- )
-
- if(res)
- run_cmake_command(
- ${TEST_TYPE}/${TEST_NAME}
- "${CMAKE_COMMAND}"
- -DRunCMake_TEST_STEP=configure
- -Dreturn_code=${res}
- "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
- -P "${RunCMake_SOURCE_DIR}/PreTestError.cmake"
- )
- return()
- endif()
+ unset(RunCMake_TEST_COMMAND)
+ set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
+ run_cmake(${TEST_NAME})
# execute optional build step
if(build)
- execute_process(
- COMMAND "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}"
- RESULT_VARIABLE res
- OUTPUT_FILE "${RunCMake_TEST_BINARY_DIR}/test_output.txt"
- ERROR_FILE "${RunCMake_TEST_BINARY_DIR}/test_error.txt"
- )
- endif()
-
- if(res)
- run_cmake_command(
- ${TEST_TYPE}/${TEST_NAME}
- "${CMAKE_COMMAND}"
- -DRunCMake_TEST_STEP=build
- -Dreturn_code=${res}
- "-Dbin_dir=${RunCMake_TEST_BINARY_DIR}"
- -P "${RunCMake_SOURCE_DIR}/PreTestError.cmake"
- )
- return()
+ set(RunCMake_TEST_COMMAND "${CMAKE_COMMAND}" --build
"${RunCMake_TEST_BINARY_DIR}")
+ run_cmake(${TEST_NAME})
endif()
# execute cpack
diff --git a/Tests/RunCMake/CPack/PreTestError.cmake
b/Tests/RunCMake/CPack/PreTestError.cmake
deleted file mode 100644
index f88f2e8..0000000
--- a/Tests/RunCMake/CPack/PreTestError.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-file(READ "${bin_dir}/test_output.txt" output)
-file(READ "${bin_dir}/test_error.txt" error)
-
-message(FATAL_ERROR "Error in pre-test phase '${RunCMake_TEST_STEP}'!\n"
- "Return code: '${return_code}'\n"
- "Info output: '${output}'\n"
- "Error output: '${error}'")
diff --git a/Tests/RunCMake/CPack/TGZ/Helpers.cmake
b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
index f14d532..4ce2590 100644
--- a/Tests/RunCMake/CPack/TGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
@@ -1,7 +1,7 @@
set(ALL_FILES_GLOB "*.tar.gz")
function(getPackageContent FILE RESULT_VAR)
- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -ztvf ${FILE}
+ execute_process(COMMAND ${TAR_EXECUTABLE} -ztvf ${FILE}
OUTPUT_VARIABLE package_content_
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
index dbaf682..c244984 100644
--- a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
@@ -1,4 +1,4 @@
function(get_test_prerequirements found_var config_file)
- file(WRITE "${config_file}" "")
+ file(WRITE "${config_file}" "set(TAR_EXECUTABLE \"${CMAKE_COMMAND}\" -E
tar)")
set(${found_var} true PARENT_SCOPE)
endfunction()
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CPack/CPackTestHelpers.cmake | 43 +++---------------------
Tests/RunCMake/CPack/PreTestError.cmake | 7 ----
Tests/RunCMake/CPack/TGZ/Helpers.cmake | 2 +-
Tests/RunCMake/CPack/TGZ/Prerequirements.cmake | 2 +-
4 files changed, 7 insertions(+), 47 deletions(-)
delete mode 100644 Tests/RunCMake/CPack/PreTestError.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
