X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fctest_scripts%2Ftravis-ci.cmake;h=8dc94f57f965bfbdaabfed54581e02bb871c19b2;hb=99c4376aed52426c865d2382afdee56f304a1e37;hp=7c1c25ff1eec9d7d6471249b5e37043acaf0816b;hpb=52c36b495597b8d07d39d070dd521ca4118113bd;p=openjpeg.git

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index 7c1c25ff..8dc94f57 100644
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -7,8 +7,21 @@
 cmake_minimum_required(VERSION 2.8)
 
 set( ENV{LANG} en_US.UTF-8)
-set( CTEST_DASHBOARD_ROOT  "$ENV{PWD}/build" )
-set( CTEST_CMAKE_GENERATOR "Unix Makefiles")   # Always makefile in travis-ci environment
+if($ENV{OPJ_BINARY_DIR})
+	set( CTEST_DASHBOARD_ROOT  "$ENV{OPJ_BINARY_DIR}" )
+else()
+	set( CTEST_DASHBOARD_ROOT  "$ENV{PWD}/build" )
+endif()
+
+if("$ENV{TRAVIS_OS_NAME}" STREQUAL "windows")
+	set( CTEST_CMAKE_GENERATOR "NMake Makefiles")
+	set( CTEST_BUILD_COMMAND   "nmake" )
+	set( JPYLYZER_EXT          "exe"  )
+else()
+	set( CTEST_CMAKE_GENERATOR "Unix Makefiles")   # Always makefile in travis-ci environment
+	set( CCFLAGS_WARNING "-Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement")
+	set( JPYLYZER_EXT          "py"  )
+endif()
 
 if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "")
   set( CTEST_BUILD_CONFIGURATION "Release")
@@ -40,20 +53,40 @@ if (NOT "$ENV{OPJ_CI_ARCH}" STREQUAL "")
 	endif()
 endif()
 
-# To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare 
-# it to the baseline. Kakadu binaries are freely available for non-commercial purposes 
-# at http://www.kakadusoftware.com.
-# Here's the copyright notice from kakadu:
-# Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.
-# You are free to trial these executables and even to re-distribute them,
-# so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.
-# Note: Binaries can only be used for non-commercial purposes.
-if ("$ENV{OPJ_NONCOMMERCIAL}" STREQUAL "1")
-	set(KDUPATH $ENV{PWD}/kdu)
-	set(ENV{LD_LIBRARY_PATH} ${KDUPATH})
-	set(ENV{PATH} $ENV{PATH}:${KDUPATH})
+if ("$ENV{OPJ_CI_ASAN}" STREQUAL "1")
+	set(OPJ_HAS_MEMCHECK TRUE)
+	set(CTEST_MEMORYCHECK_TYPE "AddressSanitizer")
+	set(CCFLAGS_ARCH "${CCFLAGS_ARCH} -O1 -g -fsanitize=address -fno-omit-frame-pointer")
+endif()
+
+if("$ENV{CC}" MATCHES ".*mingw.*")
+	# We are trying to use mingw
+	if ("$ENV{OPJ_CI_ARCH}" MATCHES "^i[3-6]86$")
+		set(CTEST_CONFIGURE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CTEST_SCRIPT_DIRECTORY}/toolchain-mingw32.cmake")
+	else()
+		set(CTEST_CONFIGURE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CTEST_SCRIPT_DIRECTORY}/toolchain-mingw64.cmake")
+	endif()
 endif()
 
+if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
+	# To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare 
+	# it to the baseline. Kakadu binaries are freely available for non-commercial purposes 
+	# at http://www.kakadusoftware.com.
+	# Here's the copyright notice from kakadu:
+	# Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.
+	# You are free to trial these executables and even to re-distribute them,
+	# so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.
+	# Note: Binaries can only be used for non-commercial purposes.
+	if ("$ENV{OPJ_NONCOMMERCIAL}" STREQUAL "1" )
+		set(KDUPATH $ENV{PWD}/kdu)
+		set(ENV{LD_LIBRARY_PATH} ${KDUPATH})
+		set(ENV{PATH} $ENV{PATH}:${KDUPATH})
+	endif()
+	set(BUILD_TESTING "TRUE")
+else()
+	set(BUILD_TESTING "FALSE")
+endif(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
+
 # Options 
 set( CACHE_CONTENTS "
 
@@ -61,10 +94,10 @@ set( CACHE_CONTENTS "
 CMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}
 
 # Warning level
-CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} -Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement
+CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} ${CCFLAGS_WARNING}
 
 # Use to activate the test suite
-BUILD_TESTING:BOOL=TRUE
+BUILD_TESTING:BOOL=${BUILD_TESTING}
 
 # Build Thirdparty, useful but not required for test suite 
 BUILD_THIRDPARTY:BOOL=TRUE
@@ -73,7 +106,7 @@ BUILD_THIRDPARTY:BOOL=TRUE
 OPJ_DATA_ROOT:PATH=$ENV{PWD}/data
 
 # jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer  
-JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer/jpylyzer.py
+JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT}
 
 " )
 
@@ -98,12 +131,17 @@ file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "${CACHE_CONTENTS}")
 # Perform a Experimental build
 ctest_start(Experimental)
 #ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
-ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}")
+ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS "${CTEST_CONFIGURE_OPTIONS}")
 ctest_read_custom_files(${CTEST_BINARY_DIRECTORY})
 ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}")
-ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2)
-
+if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
+	ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2)
+	if(OPJ_HAS_MEMCHECK)
+		ctest_memcheck(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 2)
+	endif()
+endif()
 if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1")
 	ctest_submit()
 endif()
-ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" )
+# Do not clean, we'll parse the log for known failure
+#ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" )