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

Try to suppress note submission for subsequent builds

parent 25e37eac
No related branches found
No related tags found
2 merge requests!265Address various windows issues rebased,!263Get started with AppVeyor CI
......@@ -11,25 +11,37 @@ platform:
before_build:
- del "C:\Program Files (x86)\MSBuild\14.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
- ps: Write-Host "$env:APPVEYOR_BUILD_WORKER_IMAGE"
- ps: $env:CUSTOM_BUILD_NAME = ("{0}_{1}_{2}" -f $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE -replace " ","-" )
- ps: |
$env:CUSTOM_BUILD_NAME = ("{0}_{1}_{2}" -f $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE -replace " ","-" )
if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015")
{
Write-Host "This build will push the shared notes"
$env:DO_PUSH_NOTES = "TRUE"
} else {
Write-Host "This build will only pushed the CMake cache"
$env:DO_PUSH_NOTES = "FALSE"
}
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_update=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
-DADIOS_CTEST_SUBMIT_NOTES=%DO_PUSH_NOTES%
build_script:
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_configure=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
-DADIOS_CTEST_SUBMIT_NOTES=true
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_build=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
-DADIOS_CTEST_SUBMIT_NOTES=%DO_PUSH_NOTES%
test_script:
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
-Ddashboard_full=OFF
-Ddashboard_do_test=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
-DADIOS_CTEST_SUBMIT_NOTES=%DO_PUSH_NOTES%
......@@ -5,6 +5,8 @@ set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
# set(CTEST_BUILD_FLAGS "-k -j4")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
message("av_default.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")
set(dashboard_model Experimental)
set(dashboard_binary_name "build_visual-studio")
set(dashboard_track "Continuous Integration")
......@@ -14,10 +16,6 @@ set(CTEST_UPDATE_VERSION_ONLY TRUE)
set(CTEST_SOURCE_DIRECTORY "$ENV{APPVEYOR_BUILD_FOLDER}")
set(CTEST_DASHBOARD_ROOT "C:/projects/adios2build")
# set(ENV{CC} gcc)
# set(ENV{CXX} g++)
# set(ENV{FC} gfortran)
set(dashboard_cache "
ADIOS2_USE_ADIOS1:STRING=OFF
ADIOS2_USE_BZip2:STRING=OFF
......@@ -30,6 +28,4 @@ ADIOS2_USE_ZFP:STRING=OFF
ADIOS2_USE_ZeroMQ:STRING=OFF
")
message("Inside av_default.cmake, about to include adios_common")
include(${CMAKE_CURRENT_LIST_DIR}/../dashboard/adios_common.cmake)
......@@ -66,6 +66,9 @@ set(CTEST_PROJECT_NAME "ADIOS2")
set(CTEST_DROP_SITE "open.cdash.org")
set(dashboard_git_url "https://github.com/ornladios/ADIOS2.git")
if(NOT ADIOS_CTEST_SUBMIT_NOTES)
set(ADIOS_CTEST_SUBMIT_NOTES TRUE)
endif()
if(NOT dashboard_root_name)
set(dashboard_root_name "Builds/My Tests")
endif()
......
......@@ -382,13 +382,18 @@ if(dashboard_do_update)
set(CTEST_CHECKOUT_COMMAND) # checkout on first iteration only
message("Found ${count} changed files")
# 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)
if(ADIOS_CTEST_SUBMIT_NOTES)
message("Submitting dashboard scripts as Notes")
# 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)
else()
message("Skipping notes submission for Update step")
ctest_submit(PARTS Update)
endif()
endif()
if(dashboard_do_configure)
......@@ -397,8 +402,14 @@ if(dashboard_do_configure)
endif()
message("Calling ctest_configure")
ctest_configure(${dashboard_configure_args})
set(CTEST_NOTES_FILES "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt")
ctest_submit(PARTS Configure Notes)
if(ADIOS_CTEST_SUBMIT_NOTES)
message("Submitting CMakeCache.txt as Notes")
set(CTEST_NOTES_FILES "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt")
ctest_submit(PARTS Configure Notes)
else()
message("Skipping notes submission for Configure step")
ctest_submit(PARTS Configure)
endif()
endif()
ctest_read_custom_files(${CTEST_BINARY_DIRECTORY})
......
message("Adding thirdparty subdirectories")
add_subdirectory(KWSys)
add_subdirectory(NLohmannJson)
add_subdirectory(pugixml)
......
message("TESTING MESSAGE PRINT FROM KWSYS")
set(KWSYS_NAMESPACE adios2sys)
set(KWSYS_USE_DynamicLoader ON)
set(KWSYS_USE_RegularExpression ON)
......@@ -7,10 +5,8 @@ set(KWSYS_USE_SystemTools ON)
set(KWSYS_BUILD_SHARED ${BUILD_SHARED_LIBS})
if(WIN32)
message("TURNED OFF OBJECT LIBRARY")
set(KWSYS_SPLIT_OBJECTS_FROM_INTERFACE OFF)
else()
message("TURNED ON OBJECT LIBRARY")
set(KWSYS_SPLIT_OBJECTS_FROM_INTERFACE ON)
endif()
......
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