Skip to content
Permalink
Browse files

Fix some shellcheck warnings

  • Loading branch information
nyalldawson committed May 31, 2018
1 parent efa7f99 commit 408a9fbf0b70f1eee8b5818bb7e44d75659c08e7
@@ -19,6 +19,6 @@ pushd build
export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"

python3 ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
python3 "${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py" xvfb-run ctest -V --output-on-failure -S "${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest"

popd
@@ -13,7 +13,7 @@
# #
###########################################################################

echo `date +%s` > /tmp/travis_timestamp
date +%s > /tmp/travis_timestamp

brew tap osgeo/osgeo4mac
brew update
@@ -56,5 +56,5 @@ brew install \
libzip


mkdir -p ${HOME}/Library/Python/3.6/lib/python/site-packages
echo 'import site; site.addsitedir("/usr/local/opt/gdal2-python/lib/python3.6/site-packages")' >> ${HOME}/Library/Python/3.6/lib/python/site-packages/gdal2.pth
mkdir -p "${HOME}/Library/Python/3.6/lib/python/site-packages"
echo 'import site; site.addsitedir("/usr/local/opt/gdal2-python/lib/python3.6/site-packages")' >> "${HOME}/Library/Python/3.6/lib/python/site-packages/gdal2.pth"
@@ -51,7 +51,7 @@ done
cmake \
-G 'Ninja' \
-DCMAKE_FIND_FRAMEWORK:STRING=LAST \
-DCMAKE_PREFIX_PATH:STRING=${full_prefixes} \
-DCMAKE_PREFIX_PATH:STRING="${full_prefixes}" \
-DWITH_SERVER=OFF \
-DWITH_DESKTOP=OFF \
-DWITH_STAGED_PLUGINS=ON \
@@ -14,7 +14,7 @@
###########################################################################

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo $PATH
echo "$PATH"

export PATH=/usr/bin:${PATH}

@@ -27,12 +27,12 @@ ccache -z
#
# Travis will kill the job after approx 48 minutes, we subtract 8 minutes for
# uploading and initialization (40) and subtract the bootstrapping time from that.
TIMEOUT=$(expr 40 \* 60 - `date +%s` + `cat /tmp/travis_timestamp`)
TIMEOUT=$(expr 40 \* 60 - "$(date +%s)" + "$(cat /tmp/travis_timestamp)")

export CTEST_BUILD_COMMAND=/usr/local/bin/ninja
export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}

gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure
gtimeout "${TIMEOUT}s" ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S "${DIR}/../travis.ctest" --output-on-failure

rv=$?

0 comments on commit 408a9fb

Please sign in to comment.
You can’t perform that action at this time.