Skip to content
Snippets Groups Projects
Commit c658debe authored by Wittenburg, William's avatar Wittenburg, William
Browse files

Submit different sets of notes with Update and Configure parts

parent a4afc261
No related branches found
No related tags found
2 merge requests!265Address various windows issues rebased,!263Get started with AppVeyor CI
...@@ -33,4 +33,4 @@ test_script: ...@@ -33,4 +33,4 @@ test_script:
-VV -S ../adios2/scripts\appveyor\av_default.cmake -VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF -Ddashboard_full=OFF
-Ddashboard_do_test=true -Ddashboard_do_test=true
-DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015 -DCTEST_BUILD_NAME=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%_%APPVEYOR_BUILD_NUMBER%_vs-2015
\ No newline at end of file
...@@ -283,12 +283,6 @@ endif() ...@@ -283,12 +283,6 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Send the main script as a note.
list(APPEND CTEST_NOTES_FILES
"${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
"${CMAKE_CURRENT_LIST_FILE}"
)
# Check for required variables. # Check for required variables.
foreach(req foreach(req
CTEST_CMAKE_GENERATOR CTEST_CMAKE_GENERATOR
...@@ -387,7 +381,14 @@ if(dashboard_do_update) ...@@ -387,7 +381,14 @@ if(dashboard_do_update)
ctest_update(RETURN_VALUE count) ctest_update(RETURN_VALUE count)
set(CTEST_CHECKOUT_COMMAND) # checkout on first iteration only set(CTEST_CHECKOUT_COMMAND) # checkout on first iteration only
message("Found ${count} changed files") message("Found ${count} changed files")
ctest_submit(PARTS Update)
# Send the main script as a note while submitting the Update part
set(CTEST_NOTES_FILES
"${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
"${CMAKE_CURRENT_LIST_FILE}"
)
ctest_submit(PARTS Update Notes)
endif() endif()
if(dashboard_do_configure) if(dashboard_do_configure)
...@@ -396,7 +397,8 @@ if(dashboard_do_configure) ...@@ -396,7 +397,8 @@ if(dashboard_do_configure)
endif() endif()
message("Calling ctest_configure") message("Calling ctest_configure")
ctest_configure(${dashboard_configure_args}) ctest_configure(${dashboard_configure_args})
ctest_submit(PARTS Configure) set(CTEST_NOTES_FILES "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt")
ctest_submit(PARTS Configure Notes)
endif() endif()
ctest_read_custom_files(${CTEST_BINARY_DIRECTORY}) ctest_read_custom_files(${CTEST_BINARY_DIRECTORY})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment