diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2023-12-08 12:06:51 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2023-12-08 13:28:49 +0100 |
| commit | d5af1d23a718e1d55ea368bad044f7f2b9e98012 (patch) | |
| tree | cbaf5259445023d0d43ec56eb3682baf043da987 /tools | |
| parent | e21123b6991c2d64339ecebd6617f2f7c42de783 (diff) | |
tools/travis-ci/install.sh: workaround issue with jpylyzer on Mac
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 12 | ||||
| -rwxr-xr-x | tools/travis-ci/install.sh | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index 6dbe52c4..b9f75fff 100644 --- 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 62d8c30e..1407ae8b 100755 --- 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 |