[Cmake-commits] CMake branch, next, updated. v3.6.1-1710-g00e4052
Brad King
brad.king at kitware.com
Fri Sep 2 08:23:53 EDT 2016
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 00e4052d40f668ea99b8dad204135ce2095483a1 (commit)
via 093a63a40a455b357f3c607d271c240b08b7f2bb (commit)
from 5ae80febe60a0f15532ec439a742f30b5101f552 (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=00e4052d40f668ea99b8dad204135ce2095483a1
commit 00e4052d40f668ea99b8dad204135ce2095483a1
Merge: 5ae80fe 093a63a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 08:23:52 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 08:23:52 2016 -0400
Merge topic 'extend_matlab_unit_test' into next
093a63a4 Revert topic 'extend_matlab_unit_test'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=093a63a40a455b357f3c607d271c240b08b7f2bb
commit 093a63a40a455b357f3c607d271c240b08b7f2bb
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 08:23:19 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 2 08:23:32 2016 -0400
Revert topic 'extend_matlab_unit_test'
It will be revised to address some design questions and test failures.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index a2289d5..9f96fe6 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -635,7 +635,7 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
set(devnull INPUT_FILE NUL)
endif()
- # timeout set to 120 seconds, in case it does not start
+ # timeout set to 30 seconds, in case it does not start
# note as said before OUTPUT_VARIABLE cannot be used in a platform
# independent manner however, not setting it would flush the output of Matlab
# in the current console (unix variant)
@@ -644,17 +644,12 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
RESULT_VARIABLE _matlab_result_version_call
ERROR_VARIABLE _matlab_result_version_call_error
- TIMEOUT 120
+ TIMEOUT 30
WORKING_DIRECTORY "${_matlab_temporary_folder}"
${devnull}
)
- if("${_matlab_result_version_call}" MATCHES "timeout")
- if(MATLAB_FIND_DEBUG)
- message(WARNING "[MATLAB] Unable to determine the version of Matlab."
- " Matlab call timed out after 120 seconds.")
- endif()
- return()
- endif()
+
+
if(${_matlab_result_version_call})
if(MATLAB_FIND_DEBUG)
message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
@@ -703,6 +698,7 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
endfunction()
+
#.rst:
# .. command:: matlab_add_unit_test
#
@@ -724,7 +720,6 @@ endfunction()
# matlab_add_unit_test(
# NAME <name>
# UNITTEST_FILE matlab_file_containing_unittest.m
-# [CUSTOM_MATLAB_COMMAND matlab_command_to_run_as_test]
# [UNITTEST_PRECOMMAND matlab_command_to_run]
# [TIMEOUT timeout]
# [ADDITIONAL_PATH path1 [path2 ...]]
@@ -740,11 +735,6 @@ endfunction()
# ``UNITTEST_FILE``
# the matlab unittest file. Its path will be automatically
# added to the Matlab path.
-# ``CUSTOM_MATLAB_COMMAND``
-# Matlab script command to run as the test.
-# IIf this is not set, then the following is run:
-# "runtests('matlab_file_name'), exit(max([ans(1,:).Failed]))
-# matlab_file_name comes from UNITTEST_FILE without the .m.
# ``UNITTEST_PRECOMMAND``
# Matlab script command to be ran before the file
# containing the test (eg. GPU device initialisation based on CMake
@@ -758,7 +748,6 @@ endfunction()
# ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
# a list of additional option in order
# to run Matlab from the command line.
-# -nosplash -nodesktop -nodisplay are always added.
# ``TEST_ARGS``
# Additional options provided to the add_test command. These
# options are added to the default options (eg. "CONFIGURATIONS Release")
@@ -773,9 +762,8 @@ function(matlab_add_unit_test)
endif()
set(options NO_UNITTEST_FRAMEWORK)
- set(oneValueArgs NAME UNITTEST_FILE TIMEOUT WORKING_DIRECTORY)
- set(multiValueArgs UNITTEST_PRECOMMAND ADDITIONAL_PATH
- MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS CUSTOM_TEST_COMMAND)
+ set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
+ set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS)
set(prefix _matlab_unittest_prefix)
cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -786,17 +774,15 @@ function(matlab_add_unit_test)
add_test(NAME ${${prefix}_NAME}
COMMAND ${CMAKE_COMMAND}
- "-Dtest_name=${${prefix}_NAME}"
- "-Dadditional_paths=${${prefix}_ADDITIONAL_PATH}}"
- "-Dtest_timeout=${${prefix}_TIMEOUT}"
- "-Doutput_directory=${_matlab_temporary_folder}"
- "-Dworking_directory=${${prefix}_WORKING_DIRECTORY}"
- "-DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}"
- "-Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}"
- "-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
- "-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
- "-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}"
- "-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
+ -Dtest_name=${${prefix}_NAME}
+ -Dadditional_paths=${${prefix}_ADDITIONAL_PATH}
+ -Dtest_timeout=${${prefix}_TIMEOUT}
+ -Doutput_directory=${_matlab_temporary_folder}
+ -DMatlab_PROGRAM=${Matlab_MAIN_PROGRAM}
+ -Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}
+ -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}
+ -Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}
+ -Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}
-P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
${${prefix}_TEST_ARGS}
${${prefix}_UNPARSED_ARGUMENTS}
@@ -1043,11 +1029,9 @@ function(_Matlab_get_version_from_root matlab_root matlab_known_version matlab_f
set(matlab_list_of_all_versions)
matlab_get_version_from_matlab_run("${Matlab_PROG_VERSION_STRING_AUTO_DETECT}" matlab_list_of_all_versions)
- if(matlab_list_of_all_versions)
- list(GET matlab_list_of_all_versions 0 _matlab_version_tmp)
- else()
- set(_matlab_version_tmp "unknown")
- endif()
+
+ list(GET matlab_list_of_all_versions 0 _matlab_version_tmp)
+
# set the version into the cache
set(Matlab_VERSION_STRING_INTERNAL ${_matlab_version_tmp} CACHE INTERNAL "Matlab version (automatically determined)" FORCE)
diff --git a/Modules/MatlabTestsRedirect.cmake b/Modules/MatlabTestsRedirect.cmake
index 1045be8..0ef4c3e 100644
--- a/Modules/MatlabTestsRedirect.cmake
+++ b/Modules/MatlabTestsRedirect.cmake
@@ -23,12 +23,11 @@
# -DMatlab_PROGRAM=matlab_exe_location
# -DMatlab_ADDITIONNAL_STARTUP_OPTIONS=""
# -Dtest_name=name_of_the_test
-# -Dcustom_Matlab_test_command=""
# -Dcmd_to_run_before_test=""
# -Dunittest_file_to_run
# -P FindMatlab_TestsRedirect.cmake
-set(Matlab_UNIT_TESTS_CMD -nosplash -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
+set(Matlab_UNIT_TESTS_CMD -nosplash -nojvm -nodesktop -nodisplay ${Matlab_ADDITIONNAL_STARTUP_OPTIONS})
if(WIN32)
set(Matlab_UNIT_TESTS_CMD ${Matlab_UNIT_TESTS_CMD} -wait)
endif()
@@ -37,13 +36,6 @@ if(NOT test_timeout)
set(test_timeout 180)
endif()
-# If timeout is -1, then do not put a timeout on the execute_process
-if(test_timeout EQUAL -1)
- set(test_timeout "")
-else()
- set(test_timeout TIMEOUT ${test_timeout})
-endif()
-
if(NOT cmd_to_run_before_test)
set(cmd_to_run_before_test)
endif()
@@ -58,27 +50,16 @@ foreach(s IN LISTS additional_paths)
endif()
endforeach()
-if(custom_Matlab_test_command)
- set(unittest_to_run "${custom_Matlab_test_command}")
-else()
- set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
-endif()
-
-
+set(unittest_to_run "runtests('${unittest_file_to_run_name}'), exit(max([ans(1,:).Failed]))")
if(no_unittest_framework)
set(unittest_to_run "try, ${unittest_file_to_run_name}, catch err, disp('An exception has been thrown during the execution'), disp(err), disp(err.stack), exit(1), end, exit(0)")
endif()
set(Matlab_SCRIPT_TO_RUN
- "addpath(${concat_string}); ${cmd_to_run_before_test}; ${unittest_to_run}"
+ "addpath(${concat_string}), path, ${cmd_to_run_before_test}, ${unittest_to_run}"
)
-if(NOT working_directory)
- set(working_directory "${output_directory}")
-endif()
-
-string(REPLACE "/" "_" clean_test_name "${test_name}")
-set(Matlab_LOG_FILE "${output_directory}/${clean_test_name}.log")
+set(Matlab_LOG_FILE "${output_directory}/${test_name}.log")
set(devnull)
if(UNIX)
@@ -88,11 +69,11 @@ elseif(WIN32)
endif()
execute_process(
- COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${Matlab_LOG_FILE}" -r "${Matlab_SCRIPT_TO_RUN}"
+ COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${test_name}.log" -r "${Matlab_SCRIPT_TO_RUN}"
RESULT_VARIABLE res
- ${test_timeout}
+ TIMEOUT ${test_timeout}
OUTPUT_QUIET # we do not want the output twice
- WORKING_DIRECTORY ${working_directory}
+ WORKING_DIRECTORY "${output_directory}"
${devnull}
)
@@ -106,5 +87,5 @@ message("Matlab test ${name_of_the_test} output:\n${matlab_log_content}") # if w
if(NOT (res EQUAL 0))
- message( FATAL_ERROR "[MATLAB] TEST FAILED Matlab returned ${res}" )
+ message( FATAL_ERROR "[MATLAB] TEST FAILED" )
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMatlab.cmake | 54 +++++++++++++------------------------
Modules/MatlabTestsRedirect.cmake | 35 ++++++------------------
2 files changed, 27 insertions(+), 62 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list