diff options
author | Christophe Lyon <christophe.lyon@linaro.org> | 2018-04-24 12:13:25 +0000 |
---|---|---|
committer | Christophe Lyon <christophe.lyon@linaro.org> | 2018-04-24 12:13:25 +0000 |
commit | 614214065de28498bc3a9661348a3397f0fce509 (patch) | |
tree | acf52dfebb31238ee0ef3114284d1855d562740b | |
parent | a1d7b1df75381bb21db69b7ffc502b8683844a7d (diff) |
Add ':' after FAIL/FAILED/PASS/PASSED in 'echo' commands.
The purpose is to make these messages easier to match in the Jenkins
console (as 'fail' or 'failed' appear in locations unrelated to the
tests).
Change-Id: Iece616e1877c5bba04e01ea7609f531b73ef2415
-rwxr-xr-x | test-checkout.sh | 6 | ||||
-rwxr-xr-x | test-manifest2.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test-checkout.sh b/test-checkout.sh index 7ac901b..c8e35e3 100755 --- a/test-checkout.sh +++ b/test-checkout.sh @@ -218,7 +218,7 @@ test_gccver() if ! grep -q --line-regexp "$val" "$mani"; then result=FAIL id=$(echo "$val" | cut -d = -f 1) - echo "FAIL $mani: \"$(grep "^${id}=" "$mani")\" did not match expected \"$val\"" + echo "FAIL: $mani: \"$(grep "^${id}=" "$mani")\" did not match expected \"$val\"" fi done done @@ -345,10 +345,10 @@ do_test() next_target if [ $RESULT -eq 0 ]; then NUM_PASS=$((NUM_PASS+1)) - echo "PASS $*" + echo "PASS: $*" else NUM_FAIL=$((NUM_FAIL+1)) - echo "FAIL $* (See workspace-$LOGNAME/test_$LOGNAME.log)" + echo "FAIL: $* (See workspace-$LOGNAME/test_$LOGNAME.log)" fi if [ $RESULT -eq 0 -a x"$GIT_REF_OPT_SET" = x"false" ]; then GIT_REF_OPT=--with-git-reference-dir=$TOP/workspace-$LOGNAME/snapshots diff --git a/test-manifest2.sh b/test-manifest2.sh index 1f0e571..4650a1f 100755 --- a/test-manifest2.sh +++ b/test-manifest2.sh @@ -95,21 +95,21 @@ postprocess_log() result_pass() { - echo PASSED "$*" | tee --append $TOP/results_summary.txt $TOP/results_report.txt + echo PASSED: "$*" | tee --append $TOP/results_summary.txt $TOP/results_report.txt } result_fail() { EXTRA_FILE=$1 shift - echo FAILED "$* See $(basename $EXTRA_FILE)." | tee --append $TOP/results_summary.txt $TOP/results_report.txt + echo FAILED: "$* See $(basename $EXTRA_FILE)." | tee --append $TOP/results_summary.txt $TOP/results_report.txt sed -e 's/^/>>> /' "$EXTRA_FILE" >> $TOP/results_report.txt } result_fail_no_file() { - echo FAILED "$*" | tee --append $TOP/results_summary.txt $TOP/results_report.txt + echo FAILED: "$*" | tee --append $TOP/results_summary.txt $TOP/results_report.txt } extract_run() |