Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

BUG: Ensure extension Experimental targets are associated to Experime…

…ntal track

Thanks for Ryan Eckbo developer of the "UKF extension" extension
for reporting and helping investigating the problem.

This regression is a side effect of commit r21682 [1] where parameters
are now written into files like:
  <extension-name>-test-command-args.cmake
  <extension-name>-upload-command-args.cmake
  <extension-name>-upload-only-command-args.cmake

And the file are then passed to the ctest using argument:

   -DSCRIPT_ARGS_FILE:FILEPATH=<path-to-args-file>

The written file are used to create custom targets:
  Experimenal .............. using EXTENSION_TEST_COMMAND
  ExperimentalUpload ....... using EXTENSION_UPLOAD_COMMAND
  ExperimentalUploadOnly ... using EXTENSION_UPLOAD_ONLY_COMMAND
  Nightly .................. using EXTENSION_TEST_COMMAND
  NightlyUpload ............ using EXTENSION_UPLOAD_COMMAND
  NightlyUploadOnly ........ using EXTENSION_UPLOAD_ONLY_COMMAND

Since the same files were used unconditionally for both Nightly and
Experimental targets, the latest value of CTEST_MODEL was used because
the latest set of files to be configured was done with CTEST_MODEL equal
to "Nightly".

This commit explicitly specify the value -DCTEST_MODEL:STRING=${CTEST_MODEL}
for each target command. Doing so ensure each command is associated with
the appropriate track.

[1] http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=21682

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21860 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
commit 5a1f7a6d2fadab5cacee7380db23cb1c26d20c66 1 parent ca86fc0
@jcfr jcfr authored
View
3  CMake/SlicerExtensionCPack.cmake
@@ -158,7 +158,8 @@ set(CPACK_PACKAGE_FILE_NAME \"${CPACK_PACKAGE_FILE_NAME}\")")
set(script_args_file ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_NAME}-upload-only-command-args.cmake)
file(WRITE ${script_args_file} ${EXTENSION_UPLOAD_ONLY_COMMAND_ARG_LIST})
-set(EXTENSION_UPLOAD_ONLY_COMMAND ${CMAKE_CTEST_COMMAND} ${EXTENSION_COMMAND_BUILD_CONF_ARG_LIST} -DSCRIPT_ARGS_FILE:FILEPATH=${script_args_file} -S ${EXTENSION_SCRIPT} -V${CTEST_EXTRA_VERBOSE_ARG})
+set(CTEST_MODEL "Experimental")
+set(EXTENSION_UPLOAD_ONLY_COMMAND ${CMAKE_CTEST_COMMAND} ${EXTENSION_COMMAND_BUILD_CONF_ARG_LIST} -DCTEST_MODEL:STRING=${CTEST_MODEL} -DSCRIPT_ARGS_FILE:FILEPATH=${script_args_file} -S ${EXTENSION_SCRIPT} -V${CTEST_EXTRA_VERBOSE_ARG})
add_custom_target(Experimental${target_qualifier}UploadOnly
COMMAND ${EXTENSION_UPLOAD_ONLY_COMMAND}
View
8 Extensions/CMake/SlicerBlockUploadExtension.cmake
@@ -60,10 +60,6 @@ set(Slicer_WC_REVISION \"${Slicer_WC_REVISION}\")
set(MIDAS_PACKAGE_URL \"${MIDAS_PACKAGE_URL}\")
set(MIDAS_PACKAGE_EMAIL \"${MIDAS_PACKAGE_EMAIL}\")
set(MIDAS_PACKAGE_API_KEY \"${MIDAS_PACKAGE_API_KEY}\")")
-if(NOT "${CTEST_MODEL}" STREQUAL "")
- set(EXTENSION_COMMAND_ARG_LIST "${EXTENSION_COMMAND_ARG_LIST}
-set(CTEST_MODEL \"${CTEST_MODEL}\")")
-endif()
foreach(dep ${EXTENSION_DEPENDS})
set(EXTENSION_COMMAND_ARG_LIST "${EXTENSION_COMMAND_ARG_LIST}
set(${dep}_DIR \"${${dep}_DIR}\")")
@@ -100,7 +96,7 @@ set(RUN_CTEST_UPLOAD \"FALSE\")")
set(script_args_file ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_NAME}-test-command-args.cmake)
file(WRITE ${script_args_file} ${EXTENSION_TEST_COMMAND_ARG_LIST})
-set(EXTENSION_TEST_COMMAND ${CMAKE_CTEST_COMMAND} ${EXTENSION_COMMAND_BUILD_CONF_ARG_LIST} -DSCRIPT_ARGS_FILE:FILEPATH=${script_args_file} -S ${EXTENSION_SCRIPT} -V${CTEST_EXTRA_VERBOSE_ARG})
+set(EXTENSION_TEST_COMMAND ${CMAKE_CTEST_COMMAND} ${EXTENSION_COMMAND_BUILD_CONF_ARG_LIST} -DCTEST_MODEL:STRING=${CTEST_MODEL} -DSCRIPT_ARGS_FILE:FILEPATH=${script_args_file} -S ${EXTENSION_SCRIPT} -V${CTEST_EXTRA_VERBOSE_ARG})
#-----------------------------------------------------------------------------
# Set EXTENSION_UPLOAD_COMMAND
@@ -117,4 +113,4 @@ set(EXTENSION_OPERATING_SYSTEM \"${EXTENSION_OPERATING_SYSTEM}\")")
set(script_args_file ${CMAKE_CURRENT_BINARY_DIR}/${EXTENSION_NAME}-upload-command-args.cmake)
file(WRITE ${script_args_file} ${EXTENSION_UPLOAD_COMMAND_ARG_LIST})
-set(EXTENSION_UPLOAD_COMMAND ${CMAKE_CTEST_COMMAND} ${EXTENSION_COMMAND_BUILD_CONF_ARG_LIST} -DSCRIPT_ARGS_FILE:FILEPATH=${script_args_file} -S ${EXTENSION_SCRIPT} -V${CTEST_EXTRA_VERBOSE_ARG})
+set(EXTENSION_UPLOAD_COMMAND ${CMAKE_CTEST_COMMAND} ${EXTENSION_COMMAND_BUILD_CONF_ARG_LIST} -DCTEST_MODEL:STRING=${CTEST_MODEL} -DSCRIPT_ARGS_FILE:FILEPATH=${script_args_file} -S ${EXTENSION_SCRIPT} -V${CTEST_EXTRA_VERBOSE_ARG})
Please sign in to comment.
Something went wrong with that request. Please try again.