diff options
| author | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2018-03-13 22:18:33 +0100 |
|---|---|---|
| committer | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2018-03-13 22:18:33 +0100 |
| commit | f22ae908a044ff2a89afff2b62b40fad749d6cd3 (patch) | |
| tree | 5b526357b52c6640169356edb8be29433ee4c870 | |
| parent | 6d78df962b3aeedb09f51f43fd90116fceec1e2d (diff) | |
| download | blogc-f22ae908a044ff2a89afff2b62b40fad749d6cd3.tar.gz blogc-f22ae908a044ff2a89afff2b62b40fad749d6cd3.tar.bz2 blogc-f22ae908a044ff2a89afff2b62b40fad749d6cd3.zip | |
travis: use realpath
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rwxr-xr-x | .travis/test-run.sh | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 993a54f..a260124 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - compiler: clang env: @@ -16,6 +17,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - os: osx compiler: clang @@ -27,6 +29,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - valgrind - compiler: clang @@ -35,6 +38,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - valgrind - compiler: gcc @@ -43,6 +47,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - rpm - compiler: gcc @@ -51,6 +56,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - compiler: gcc env: @@ -58,6 +64,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - compiler: gcc env: @@ -65,6 +72,7 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - gcc-mingw-w64-i686 - compiler: gcc @@ -73,12 +81,14 @@ matrix: addons: apt: packages: + - realpath - libcmocka-dev - gcc-mingw-w64-x86-64 install: - gem install ronn - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install coreutils; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cmocka; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi diff --git a/.travis/test-run.sh b/.travis/test-run.sh index ff84b50..8858dd8 100755 --- a/.travis/test-run.sh +++ b/.travis/test-run.sh @@ -2,7 +2,12 @@ set -e -SCRIPT_DIR="$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")" +REALPATH=grealpath +if ! command -v grealpath >/dev/null 2>&1; then + REALPATH=realpath +fi + +SCRIPT_DIR="$(dirname "$("${REALPATH}" "${BASH_SOURCE[0]}")")" TARGET_SCRIPT="${SCRIPT_DIR}/targets/${TARGET}.sh" if [[ -n "${TARGET}" ]] && [[ -e "${TARGET_SCRIPT}" ]]; then |