From e12db2bb5324b02c7bb20332be83df492daa68ca Mon Sep 17 00:00:00 2001 From: Oleg Moiseenko <807634+merlokk@users.noreply.github.com> Date: Mon, 19 Aug 2019 18:43:01 +0300 Subject: [PATCH] travis osx (#339) changed homebrew install to make all. added pwd to twst script --- .travis.yml | 5 +++-- pm3test.sh | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 334b8c890..5357326c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,8 @@ install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew info proxmark3; brew options proxmark3; - brew install --verbose --HEAD proxmark3; + make clean; + make all V=1; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean; make all V=1; @@ -51,7 +52,7 @@ before_script: script: ## start and run a test script if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - proxmark3 -h ; + ./pm3test.sh; elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./pm3test.sh; fi diff --git a/pm3test.sh b/pm3test.sh index e127944f6..6c7328475 100644 --- a/pm3test.sh +++ b/pm3test.sh @@ -49,6 +49,9 @@ function CheckExecute() { printf "\n${C_BLUE}RRG/Iceman Proxmark3 test tool ${C_NC}\n\n" +printf "work directory: " +pwd + if [ "$TRAVIS_COMMIT" ]; then if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo "Travis branch: $TRAVIS_BRANCH slug: $TRAVIS_REPO_SLUG commit: $TRAVIS_COMMIT"