Merge pull request #1494 from tomoaki0705/suppress_warning_clang

suppress warning during build using clang

diff --git a/tests/nonregression/test_suite.ctest.in b/tests/nonregression/test_suite.ctest.in
index 6dd70c632e5fa1732d59d69709a9c95ca6a3879b..584dfaf7fde68478abaec93697243af2f91afc04 100644 (file)
--- a/tests/nonregression/test_suite.ctest.in
+++ b/tests/nonregression/test_suite.ctest.in
@@ -229,9 +229,9 @@ opj_decompress -i  @INPUT_NR_PATH@/kodak_2layers_lrcp.j2c -o @TEMP_PATH@/kodak_2
 opj_decompress -i  @INPUT_NR_PATH@/kodak_2layers_lrcp.j2c -o @TEMP_PATH@/kodak_2layers_lrcp-l2.j2c.pgx -l 2
 # related to issue 104 and 110
 opj_decompress -i  @INPUT_NR_PATH@/issue104_jpxstream.jp2 -o @TEMP_PATH@/issue104_jpxstream.jp2.pgx
-# File not supported by kakadu (Malformed PCLR box) and not supoprter by openjpeg (problem with value of TPSot)
+# File not supported by kakadu (Malformed PCLR box) and not supported by openjpeg (problem with value of TPSot)
 !opj_decompress -i  @INPUT_NR_PATH@/mem-b2ace68c-1381.jp2 -o @TEMP_PATH@/mem-b2ace68c-1381.jp2.pgx
-# File which produced weird output with kakadu and not supoprter by openjpeg (problem with value of TPSot, issue 202, 206, 208)
+# File which produced weird output with kakadu and not supported by openjpeg (problem with value of TPSot, issue 202, 206, 208)
 opj_decompress -i  @INPUT_NR_PATH@/mem-b2b86b74-2753.jp2 -o @TEMP_PATH@/mem-b2b86b74-2753.jp2.pgx
 # issue 191 raised by the gdal fuzzer test (should properly failed)
 !opj_decompress -i  @INPUT_NR_PATH@/gdal_fuzzer_unchecked_numresolutions.jp2 -o @TEMP_PATH@/gdal_fuzzer_unchecked_numresolutions.pgx

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index 6dbe52c4dd216e6f5f96ee8c1456de0cf8d42b81..b9f75fff3ac5905b71807c29053a592a25f74a3e 100644 (file)
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -127,13 +127,19 @@ BUILD_UNIT_TESTS:BOOL=TRUE
 # JPEG2000 test files are available with git clone https://github.com/uclouvain/openjpeg-data.git
 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_EXT}
-
 # Enable astyle
 WITH_ASTYLE:BOOL=${BUILD_ASTYLE}
 " )
 
+if(EXISTS "$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT}")
+    set(CACHE_CONTENTS "
+${CACHE_CONTENTS}
+
+# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer
+JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT}
+")
+endif()
+
 #---------------------
 #1. openjpeg specific:
 set( CTEST_PROJECT_NAME        "OPENJPEG" )

diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh
index 2945398615300477e8717b1b32cc6e65b26ddffd..1407ae8b2348a2f72be0c5c93b1b58ed6c26d1f6 100755 (executable)
--- a/tools/travis-ci/install.sh
+++ b/tools/travis-ci/install.sh
@@ -59,7 +59,9 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
        # We need jpylyzer for the test suite
     JPYLYZER_VERSION="1.17.0"    
        echo "Retrieving jpylyzer"
-       if [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows" ]; then
+       if [ "${TRAVIS_OS_NAME:-}" == "osx"  -o "${RUNNER_OS:-}" == "macOS" ] || uname -s | grep -i Darwin &> /dev/null; then
+        echo "Skip Retrieving jpylyzer on OSX. Related tests no longer work on CI"
+       elif [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows" ]; then
                wget -q https://github.com/openpreserve/jpylyzer/releases/download/${JPYLYZER_VERSION}/jpylyzer_${JPYLYZER_VERSION}_win32.zip
                mkdir jpylyzer
                cd jpylyzer
@@ -79,29 +81,29 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
        if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then
                if [ "${TRAVIS_OS_NAME:-}" == "linux" -o "${RUNNER_OS:-}" == "Linux" ] || uname -s | grep -i Linux &> /dev/null; then
                        echo "Retrieving Kakadu"
-                       wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Linux-x86-64_200602.zip
-                       cmake -E tar -xf KDU805_Demo_Apps_for_Linux-x86-64_200602.zip
-                       mv KDU805_Demo_Apps_for_Linux-x86-64_200602 kdu
+                       wget -q http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_Linux-x86-64_231117.zip
+                       cmake -E tar -xf KDU841_Demo_Apps_for_Linux-x86-64_231117.zip
+                       mv KDU841_Demo_Apps_for_Linux-x86-64_231117 kdu
                elif [ "${TRAVIS_OS_NAME:-}" == "osx"  -o "${RUNNER_OS:-}" == "macOS" ] || uname -s | grep -i Darwin &> /dev/null; then
                        echo "Retrieving Kakadu"
-                       wget -v http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip
-                       cmake -E tar -xf KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip
+                       wget -v http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_MacOS_231117.dmg_.zip
+                       cmake -E tar -xf KDU841_Demo_Apps_for_MacOS_231117.dmg_.zip
                        wget -q http://downloads.sourceforge.net/project/catacombae/HFSExplorer/0.23/hfsexplorer-0.23-bin.zip
                        mkdir hfsexplorer && cmake -E chdir hfsexplorer tar -xf ../hfsexplorer-0.23-bin.zip
-                       ./hfsexplorer/bin/unhfs.sh -o ./ -fsroot Kakadu-demo-apps.pkg  KDU805_Demo_Apps_for_MacOS_200602.dmg
+                       ./hfsexplorer/bin/unhfs.sh -o ./ -fsroot Kakadu-demo-apps.pkg  KDU841_Demo_Apps_for_MacOS_231117.dmg
                        pkgutil --expand Kakadu-demo-apps.pkg ./kdu
                        cd kdu
-                       cat libkduv80r.pkg/Payload | gzip -d | cpio -id
+                       cat libkduv84r.pkg/Payload | gzip -d | cpio -id
                        cat kduexpand.pkg/Payload | gzip -d | cpio -id
                        cat kducompress.pkg/Payload | gzip -d | cpio -id
-                       install_name_tool -id ${PWD}/libkdu_v80R.dylib libkdu_v80R.dylib 
-                       install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_compress
-                       install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_expand
+                       install_name_tool -id ${PWD}/libkdu_v84R.dylib libkdu_v84R.dylib 
+                       install_name_tool -change /usr/local/lib/libkdu_v84R.dylib ${PWD}/libkdu_v84R.dylib kdu_compress
+                       install_name_tool -change /usr/local/lib/libkdu_v84R.dylib ${PWD}/libkdu_v84R.dylib kdu_expand
                elif [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows"  ] || uname -s | grep -i MINGW &> /dev/null || uname -s | grep -i CYGWIN &> /dev/null; then
                        echo "Retrieving Kakadu"
-                       wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Win64_200602.msi_.zip
-                       cmake -E tar -xf KDU805_Demo_Apps_for_Win64_200602.msi_.zip
-                       msiexec /i KDU805_Demo_Apps_for_Win64_200602.msi /quiet /qn /norestart
+                       wget -q http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_Win64_231117.msi_.zip
+                       cmake -E tar -xf KDU841_Demo_Apps_for_Win64_231117.msi_.zip
+                       msiexec /i KDU841_Demo_Apps_for_Win64_231117.msi /quiet /qn /norestart
                        if [ -d "C:/Program Files/Kakadu" ]; then
                                cp -r "C:/Program Files/Kakadu" ./kdu
                        else