From c132535cf562c817a1fb163858cb9d689141efc6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 6 Dec 2022 08:52:05 +0100 Subject: [PATCH 1/2] busybox: replicate the same output as GNU --- .github/workflows/CICD.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index a51d3fdcb..6be762493 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -791,6 +791,9 @@ jobs: echo "PASS $PASS" echo "TOTAL $TOTAL" cd - + output="Busybox tests summary = TOTAL: $TOTAL / PASS: $PASS / FAIL: $FAIL / SKIP: $SKIP" + echo "${output}" + if [[ "$FAIL" -gt 0 || "$ERROR" -gt 0 ]]; then echo "::warning ::${output}" ; fi jq -n \ --arg date "$(date --rfc-email)" \ --arg sha "$GITHUB_SHA" \ From 20f6b6d0c5fd02dcf74f5a8abe6128a90876078f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 6 Dec 2022 10:45:28 +0100 Subject: [PATCH 2/2] Fix the # of SKIP --- .github/workflows/CICD.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 6be762493..bb5a13886 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -784,10 +784,10 @@ jobs: printf "%s\n" "${output}" FAIL=$(echo "$output" | grep "^FAIL:\s" | wc --lines) PASS=$(echo "$output" | grep "^PASS:\s" | wc --lines) - SKIPPED=$(echo "$output" | grep "^SKIPPED:\s" | wc --lines) - TOTAL=`expr $FAIL + $PASS + $SKIPPED` + SKIP=$(echo "$output" | grep "^SKIPPED:\s" | wc --lines) + TOTAL=`expr $FAIL + $PASS + $SKIP` echo "FAIL $FAIL" - echo "SKIP $SKIPPED" + echo "SKIP $SKIP" echo "PASS $PASS" echo "TOTAL $TOTAL" cd - @@ -799,7 +799,7 @@ jobs: --arg sha "$GITHUB_SHA" \ --arg total "$TOTAL" \ --arg pass "$PASS" \ - --arg skip "$SKIPPED" \ + --arg skip "$SKIP" \ --arg fail "$FAIL" \ '{($date): { sha: $sha, total: $total, pass: $pass, skip: $skip, fail: $fail, }}' > '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)