diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aead2f80075f846e5ade8341c3f3545010f57d2d..75868c94a35c309c628f0b61d7ed58573bcb5a6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,11 +64,11 @@ fast-build: - build/*/*.log #CMake log - log/*.txt # Others -debian-build: - extends: .common-build - image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable - script: - - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc +#~ debian-build: + #~ extends: .common-build + #~ image: $BUILD_IMAGE_REGISTRY/otb-debian-native:unstable + #~ script: + #~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=debian-unstable-gcc .common-prepare: extends: .general @@ -108,42 +108,42 @@ ubuntu-superbuild-build: - build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2 ## CentOS superbuild -centos-superbuild-prepare: - extends: .common-prepare - image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 - script: - - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - -centos-superbuild-build: - extends: .common-build - image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 - script: - - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base - dependencies: - - centos-superbuild-prepare +#~ centos-superbuild-prepare: + #~ extends: .common-prepare + #~ image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 + #~ script: + #~ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base +#~ +#~ centos-superbuild-build: + #~ extends: .common-build + #~ image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6 + #~ script: + #~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base + #~ - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base + #~ dependencies: + #~ - centos-superbuild-prepare ## MacOS superbuild -macos-superbuild-prepare: - tags: - - macos - extends: .common-prepare - before_script: - # No need to install lfs as this machine is persistent - # No need to do git config - # Checkout the expected branch - - export GIT_LFS_SKIP_SMUDGE=1 - - git checkout -f -q $CI_COMMIT_SHA - - export GIT_LFS_SKIP_SMUDGE=0 - script: - - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - -macos-superbuild-build: - tags: - - macos - extends: .common-build - script: - - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild - - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild - dependencies: - - macos-superbuild-prepare +#~ macos-superbuild-prepare: + #~ tags: + #~ - macos + #~ extends: .common-prepare + #~ before_script: + #~ # No need to install lfs as this machine is persistent + #~ # No need to do git config + #~ # Checkout the expected branch + #~ - export GIT_LFS_SKIP_SMUDGE=1 + #~ - git checkout -f -q $CI_COMMIT_SHA + #~ - export GIT_LFS_SKIP_SMUDGE=0 + #~ script: + #~ - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild +#~ +#~ macos-superbuild-build: + #~ tags: + #~ - macos + #~ extends: .common-build + #~ script: + #~ - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild + #~ - ctest -VV -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild + #~ dependencies: + #~ - macos-superbuild-prepare diff --git a/CI/ubuntu-18.04-llvm-xdk.cmake b/CI/ubuntu-18.04-llvm-xdk.cmake index d59dcba4819ce259be726b7101e64a5c6df8db5b..4a7ce50940e02815377aa0912885bdf3cbf5dba7 100644 --- a/CI/ubuntu-18.04-llvm-xdk.cmake +++ b/CI/ubuntu-18.04-llvm-xdk.cmake @@ -41,7 +41,7 @@ BUILD_DOCUMENTATION:BOOL=ON OTB_DOXYGEN_ITK_TAGFILE:FILEPATH=${CTEST_BINARY_DIRECTORY}/InsightDoxygenDocTag-4.13.0 OTB_DOXYGEN_ITK_DOXYGEN_URL:STRING=\"https://itk.org/Doxygen413/html\" ") - set (ENABLE_DOXYGEN ON) + # set (ENABLE_DOXYGEN ON) # The ITK doxygen tag file needs to be patched before being used for OTB # See otb-devutils/Scripts/tagfile_fix.py message(STATUS "Get resources for Doxygen build ...") diff --git a/Examples/Tutorials/test/CMakeLists.txt b/Examples/Tutorials/test/CMakeLists.txt index e1e7252ab474e96999195a82dc285c6fb4595351..b9d0dac7925f0d470db9e8c1d618ceff3563eb2d 100644 --- a/Examples/Tutorials/test/CMakeLists.txt +++ b/Examples/Tutorials/test/CMakeLists.txt @@ -34,6 +34,11 @@ otb_add_test(NAME trTeTutorialsPipelineTest COMMAND ${OTB_TEST_DRIVER} ${TEMP}/TutorialsPipelineOutput.png ) +otb_add_test(NAME trTeTutorialsPipelineTestDirect COMMAND $<TARGET_FILE:Pipeline> + ${INPUTDATA}/QB_Suburb.png + ${TEMP}/TutorialsPipelineOutput.png +) + otb_add_test(NAME trTeTutorialsFilteringPipelineTest COMMAND ${OTB_TEST_DRIVER} --compare-image ${NOTOL} ${BASELINE}/TutorialsFilteringPipelineOutput.png