Unverified Commit d1408923 authored by Floris Berendsen's avatar Floris Berendsen Committed by GitHub

Merge branch 'develop' into SELX-151-Application-Commandline-does-not-install-Demo-scripts-on-linux

parents 035113e9 4158f6f7
#
# Note that the ITK/CMakeLists.txt file configures this file
#
# CMake/CTestCustom.cmake.in
#
# to this file
#
# ${ITK_BINARY_DIR}/CTestCustom.cmake
#
#----------------------------------------------------------------------
#
# For further details regarding this file,
# see http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
#
# and
# http://www.kitware.com/blog/home/post/27
#
#----------------------------------------------------------------------
set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 199)
set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 50)
set(CTEST_CUSTOM_TESTS_IGNORE
@CTEST_CUSTOM_TESTS_IGNORE@
)
set(CTEST_CUSTOM_MEMCHECK_IGNORE
@CTEST_CUSTOM_MEMCHECK_IGNORE@
)
set(CTEST_EXTRA_COVERAGE_GLOB
Source/.*/*.h
Source/.*/*.txx
Source/.*/*.cxx
)
set(CTEST_CUSTOM_COVERAGE_EXCLUDE
${CTEST_CUSTOM_COVERAGE_EXCLUDE}
# Exclude try_compile sources from coverage results:
"/CMakeFiles/CMakeTmp/"
# Exclude files from the Examples directories
".*/Examples/.*"
# Exclude files from the Testing directories
".*/test/.*"
".*/Testing/.*"
# Exclude files from the ThirdParty Utilities directories
".*/ThirdParty/.*"
".*/Utilities/.*"
# Exclude files from the Wrapping directories
".*/Wrapping/.*"
)
set(CTEST_CUSTOM_WARNING_EXCEPTION
${CTEST_CUSTOM_WARNING_EXCEPTION}
"warning LNK4221.*no public symbols found"
"ranlib:.*file:.*has no symbols"
"ranlib: file: .+ has no symbols"
"libtool:.*file:.*has no symbols"
"ipo: warning #11053"
"ipo: warning #11053"
"vxl.core.vnl.algo"
"vxl.core.vnl"
"vxl.v3p.netlib"
"itkjpeg"
"usr.include.stdint.h"
"Warning itk::Statistics::Histogram"
"itkIOCommonTest.cxx:.*warning:.* is deprecated"
"/usr/bin/ld: warning: libnetcdf.so.3, needed by.*may conflict with libnetcdf.so.4"
"itkQuadEdgeMeshEdgeMergeDecimationFilter.hxx:.*warning: unused parameter.*iEdge.*"
"vnl_diag_matrix.h"
"WARNING non-zero return value in ctest"
"Warning.*Anachronism.*"
"attempted multiple inclusion of file"
"warning LNK4221: This object file does not define any previously undefined public symbols"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Dd][Ii][Cc][Oo][Mm][Pp]arser[/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Ee]xpat[/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Jj][Pp][Ee][Gg][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Kk][Ww][Ss]ys[/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Mm]eta[Ii][Oo][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Nn]etlib[/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Nn][Ii][Ff][Tt][Ii][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Oo]pen[Jj][Pp][Ee][Gg][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Pp][Nn][Gg][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Tt][Ii][Ff][Ff][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Vv][Nn][Ll][/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Vv][Nn][Ll][Ii]nstantiation[/\\\\].*[Ww]arning.*"
".*[/\\\\][Mm]odules[/\\\\][Tt]hird[Pp]arty[/\\\\][Zz][Ll][Ii][Bb][/\\\\].*[Ww]arning.*"
".*Microsoft.*include.*win.*.h.*[Ww]arning.*"
".*include.opencv2.*warning.*"
".*core.vidl.*warning.*"
".*core.vnl.vnl_matrix_fixed.h.*warning.*"
# ExternalProject: Git writes status to stderr
"Cloning into.*"
"Note: checking out.*"
"HEAD is now at.*"
# FFTW ExternalProject
".*fftw[fd]/src/fftw[fd]./*"
"libtool: install: warning: relinking .libfftw3f?_threads.la."
# Ignore clang's summary warning, assuming prior text has matched some
# other warning expression:
"[0-9,]+ warnings? generated."
# The PCRE, SWIG, and third party builds for wrapping.
".*/PCRE/.*"
".*/swig/.*"
".*parser.py.*"
"checking maximum warning verbosity option.*"
"warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries"
# Doxygen warnings
"include/itkIsConvertible.h:[0-9]+: warning: Conditional section with label HIDE_META_PROGRAMMING"
# KWStyle's internal utilities
".*KWStyle/Utilities.*"
# CircleCI distcc warnings
".*WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED.*"
"Warning: Permanently added.*to the list of known hosts"
# macOS std::string visibility linker warnings
"for std::string means the weak symbol cannot be overridden at runtime"
"global weak symbol typeinfo name for std::vector<"
"global weak symbol typeinfo for std::vector<"
)
if(APPLE)
set(CTEST_CUSTOM_WARNING_EXCEPTION
${CTEST_CUSTOM_WARNING_EXCEPTION}
"warning -.: directory name .* does not exist"
"ld.*warning.*duplicate dylib.*"
)
endif()
set(CTEST_CUSTOM_ERROR_EXCEPTION
# Emscripten
".*WARNING root: emcc: cannot find library.*"
)
......@@ -234,6 +234,7 @@ set( SUPERELASTIX_INSTALL_USE_FILE ${CMAKE_INSTALL_DIR}/UseSuperElastix.cmake )
configure_file( SuperElastixConfig.cmake.in install/SuperElastixConfig.cmake @ONLY)
configure_file( SuperElastixConfigVersion.cmake.in install/SuperElastixConfigVersion.cmake @ONLY)
configure_file( UseSuperElastix.cmake.in install/UseSuperElastix.cmake @ONLY )
configure_file(CMake/CTestCustom.cmake.in CTestCustom.cmake @ONLY)
install( FILES
${PROJECT_BINARY_DIR}/install/SuperElastixConfig.cmake
......
#=========================================================================
#
# Copyright Leiden University Medical Center, Erasmus University Medical
# Center and contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#=========================================================================
# Directories relative to the build directory.
set(CTEST_SOURCE_DIRECTORY "../../src")
set(CTEST_BINARY_DIRECTORY ".")
set(CTEST_SITE "lkeb-selx01")
find_package( Git REQUIRED )
execute_process (
COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
OUTPUT_VARIABLE SELX_GIT_COMMIT_SHA
)
execute_process (
COMMAND ${GIT_EXECUTABLE} name-rev --name-only HEAD
WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
OUTPUT_VARIABLE SELX_GIT_BRANCH_NAME
)
set(CTEST_BUILD_NAME "${SELX_GIT_BRANCH_NAME};Tests;commit=SHA\\:${SELX_GIT_COMMIT_SHA}")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_BUILD_FLAGS "-j4")
set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} --build ${CTEST_BINARY_DIRECTORY}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DWITH_TESTING:BOOL=ON ${CTEST_BUILD_OPTIONS}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
ctest_start("Nightly")
ctest_test()
ctest_submit( PARTS Test )
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
##
## # The following are required to submit to the CDash dashboard:
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "SuperElastix")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "my.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=SuperElastix")
set(CTEST_DROP_SITE_CDASH TRUE)
......@@ -31,36 +31,31 @@ def updateGithubCommitStatus(build) {
node('lkeb-vm-test') {
stage('Init') {
cmake = tool 'CMake 3.5.1'
sh 'rm -rf build'
sh 'mkdir -p build'
}
stage('Init') {
cmake = tool 'CMake 3.5.1'
sh 'rm -rf build'
sh 'mkdir -p build'
}
timeout(120) {
stage('Checkout') {
sh 'mkdir -p src'
dir('src') {
checkout scm
}
}
stage('Build') {
dir('build') {
sh "${ cmake } ../src/SuperBuild"
sh 'make clean'
sh 'make -j4'
}
}
dir('src') {
updateGithubCommitStatus(currentBuild)
}
}
timeout(45) {
stage('Test') {
dir('build/SuperElastix-build') {
sh "`dirname ${ cmake }`/ctest"
}
}
}
timeout(120) {
stage('Checkout') {
sh 'mkdir -p src'
dir('src') {
checkout scm
}
}
stage('SuperBuild') {
dir('build') {
sh "`dirname ${ cmake }`/ctest --script ../src/SuperBuild/CTest.cmake"
}
}
stage('Test') {
dir('build/SuperElastix-build') {
sh "`dirname ${ cmake }`/ctest --script ../../src/CTest.cmake"
}
}
dir('src') {
updateGithubCommitStatus(currentBuild)
}
}
}
......@@ -48,6 +48,8 @@ set( SUPERELASTIXSUPERBUILD_MINOR_VERSION 1)
set( SUPERELASTIXSUPERBUILD_PATCH_VERSION 0)
set( SUPERELASTIXSUPERBUILD_VERSION ${SUPERELASTIXSUPERBUILD_MAJOR_VERSION}.${SUPERELASTIXSUPERBUILD_MINOR_VERSION}.${SUPERELASTIXSUPERBUILD_PATCH_VERSION})
include (CTest)
find_package( Git REQUIRED )
include( ExternalProject )
......
#=========================================================================
#
# Copyright Leiden University Medical Center, Erasmus University Medical
# Center and contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0.txt
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#=========================================================================
# Directories relative to the build directory.
set(CTEST_SOURCE_DIRECTORY "../src/SuperBuild")
set(CTEST_BINARY_DIRECTORY ".")
set(CTEST_SITE "lkeb-selx01")
find_package( Git REQUIRED )
execute_process (
COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
OUTPUT_VARIABLE SELX_GIT_COMMIT_SHA
)
execute_process (
COMMAND ${GIT_EXECUTABLE} name-rev --name-only HEAD
WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
OUTPUT_VARIABLE SELX_GIT_BRANCH_NAME
)
set(CTEST_BUILD_NAME "${SELX_GIT_BRANCH_NAME};Build;commit=SHA\\:${SELX_GIT_COMMIT_SHA}")
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_BUILD_FLAGS "-j4")
set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} --build ${CTEST_BINARY_DIRECTORY}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DWITH_TESTING:BOOL=ON ${CTEST_BUILD_OPTIONS}")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"")
set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
ctest_start("Nightly")
ctest_configure()
ctest_build()
ctest_submit( PARTS Configure Build )
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
##
## # The following are required to submit to the CDash dashboard:
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "SuperElastix")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "my.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=SuperElastix")
set(CTEST_DROP_SITE_CDASH TRUE)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment