From 5be53281dae5e014c305c41e37eef25c203bcba0 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Mon, 19 Aug 2019 18:56:00 +0300 Subject: [PATCH 1/4] check get rid of chmod --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5357326c6..17b15fa55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,9 +46,6 @@ install: make all V=1; fi -before_script: - - chmod +x pm3test.sh - script: ## start and run a test script if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then From da279dec3b5317c1ab581094241dc5cb0e93cc3c Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Mon, 19 Aug 2019 19:01:08 +0300 Subject: [PATCH 2/4] ignore test if fail --- pm3test.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pm3test.sh b/pm3test.sh index 6c7328475..881c17f23 100755 --- a/pm3test.sh +++ b/pm3test.sh @@ -5,6 +5,7 @@ cd "$PM3PATH" || exit 1 C_RED='\033[0;31m' C_GREEN='\033[0;32m' +C_YELLOW='\033[0;33m' C_BLUE='\033[0;34m' C_NC='\033[0m' # No Color @@ -25,7 +26,7 @@ function CheckFileExist() { return 1 } -# title, command line, check result, repeat several times if failed +# title, command line, check result, repeat several times if failed, ignore if fail function CheckExecute() { if [ $4 ]; then @@ -43,6 +44,12 @@ function CheckExecute() { if [ ! $I == "e" ]; then echo "retry $I"; fi done + + if [ $5 ]; then + echo -e "$1 ${C_YELLOW}[Ignored]${C_NC}" + return 0 + fi + echo -e "$1 ${C_RED}[Fail]${C_NC}" return 1 } @@ -78,7 +85,7 @@ while true; do if ! CheckExecute "hf mf offline text" "./client/proxmark3 -c 'hf mf'" "at_enc"; then break; fi - if ! CheckExecute "hf mf hardnested test" "./client/proxmark3 -c 'hf mf hardnested t 1 000000000000'" "found:" "repeat"; then break; fi + if ! CheckExecute "hf mf hardnested test" "./client/proxmark3 -c 'hf mf hardnested t 1 000000000000'" "found:" "repeat" "ignore"; then break; fi if ! CheckExecute "emv test" "./client/proxmark3 -c 'emv test'" "Test(s) \[ OK"; then break; fi printf "\n${C_GREEN}Tests [OK]${C_NC}\n\n" From 5a603e296c4358381d4eadf76319dca739141570 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Mon, 19 Aug 2019 19:09:28 +0300 Subject: [PATCH 3/4] add iclass test --- pm3test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pm3test.sh b/pm3test.sh index 881c17f23..beb8e29c6 100755 --- a/pm3test.sh +++ b/pm3test.sh @@ -86,6 +86,7 @@ while true; do if ! CheckExecute "hf mf offline text" "./client/proxmark3 -c 'hf mf'" "at_enc"; then break; fi if ! CheckExecute "hf mf hardnested test" "./client/proxmark3 -c 'hf mf hardnested t 1 000000000000'" "found:" "repeat" "ignore"; then break; fi + if ! CheckExecute "hf mf iclass test" "./client/proxmark3 -c 'hf iclass loclass t'" "found:"; then break; fi if ! CheckExecute "emv test" "./client/proxmark3 -c 'emv test'" "Test(s) \[ OK"; then break; fi printf "\n${C_GREEN}Tests [OK]${C_NC}\n\n" From 48fdf62c09acec5bdde4fe3186e36de993e13ed1 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Mon, 19 Aug 2019 19:20:02 +0300 Subject: [PATCH 4/4] iclass test fix --- pm3test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pm3test.sh b/pm3test.sh index beb8e29c6..18e693fbe 100755 --- a/pm3test.sh +++ b/pm3test.sh @@ -86,7 +86,7 @@ while true; do if ! CheckExecute "hf mf offline text" "./client/proxmark3 -c 'hf mf'" "at_enc"; then break; fi if ! CheckExecute "hf mf hardnested test" "./client/proxmark3 -c 'hf mf hardnested t 1 000000000000'" "found:" "repeat" "ignore"; then break; fi - if ! CheckExecute "hf mf iclass test" "./client/proxmark3 -c 'hf iclass loclass t'" "found:"; then break; fi + if ! CheckExecute "hf mf iclass test" "./client/proxmark3 -c 'hf iclass loclass t'" "verified ok"; then break; fi if ! CheckExecute "emv test" "./client/proxmark3 -c 'emv test'" "Test(s) \[ OK"; then break; fi printf "\n${C_GREEN}Tests [OK]${C_NC}\n\n"