diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 17:16:25 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 17:16:25 +0200 |
| commit | 8d2019ae73ea646fda7ca91a6a93d88edaee4490 (patch) | |
| tree | 4dbb6045dcb1e449bee16ff44c32e1d3f4ddcb65 /tools | |
| parent | cf6db1641ac2a9be86a99a573dd5866832e7ba80 (diff) | |
Correct source path
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/travis-ci/run.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index eaa8d45a..d04d74f9 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -24,9 +24,9 @@ set -o pipefail ## Fail on error in pipe function opjpath () { if [ "${OPJ_CI_IS_CYGWIN:-}" == "1" ]; then - cygpath -m "$1" + cygpath $1 "$2" else - echo "$1" + echo "$2" fi } @@ -158,11 +158,11 @@ cmake --version export OPJ_SITE=${OPJ_SITE} export OPJ_BUILDNAME=${OPJ_BUILDNAME} -export OPJ_SOURCE_DIR=${OPJ_SOURCE_DIR} +export OPJ_SOURCE_DIR=$(opjpath -m ${OPJ_SOURCE_DIR}) export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION} export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT} -ctest -S $(opjpath ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake) -V || true +ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -V || true # ctest will exit with various error codes depending on version. # ignore ctest exit code & parse this ourselves set +x @@ -217,11 +217,11 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then awk -F: '{ print $2 }' ${OPJ_FAILEDTEST_LOG} > failures.txt while read FAILEDTEST; do # Start with common errors - if grep -x "${FAILEDTEST}" ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-all.txt > /dev/null; then + if grep -x "${FAILEDTEST}" $(opjpath -u ${OPJ_SOURCE_DIR})/tools/travis-ci/knownfailures-all.txt > /dev/null; then continue fi - if [ -f ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt ]; then - if grep -x "${FAILEDTEST}" ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt > /dev/null; then + if [ -f $(opjpath -u ${OPJ_SOURCE_DIR})/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt ]; then + if grep -x "${FAILEDTEST}" $(opjpath -u ${OPJ_SOURCE_DIR})/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt > /dev/null; then continue fi fi |