andrew/shunit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve namespace collision between tunit and junit counters so they can both be used in the same script

Browse Source
This commit is contained in:
Andrew Kesterson
2024-08-22 07:56:32 -04:00
committed by GitHub
parent e4aa02741e
commit 8a402691da
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/tunit.sh
View File

@@ -7,10 +7,10 @@
# #
# If COLOR=on, then the OK/FAIL bits are in RED or GREEN. # If COLOR=on, then the OK/FAIL bits are in RED or GREEN.
SHUNIT_FAILURES=0 TUNIT_FAILURES=0
SHUNIT_ERRORS=0 TUNIT_ERRORS=0
SHUNIT_TESTS=0 TUNIT_TESTS=0
SHUNIT_TIMERSTART=$(date "+%s") TUNIT_TIMERSTART=$(date "+%s")
COLOR=${COLOR:-on} COLOR=${COLOR:-on}
@@ -36,10 +36,10 @@ function tunit_header()
EOF EOF
return 1 return 1
fi fi
SHUNIT_FAILURES=0 TUNIT_FAILURES=0
SHUNIT_ERRORS=0 TUNIT_ERRORS=0
SHUNIT_TESTS=0 TUNIT_TESTS=0
SHUNIT_TIMERSTART=$(date "+%s") TUNIT_TIMERSTART=$(date "+%s")
return 0 return 0
} }
@@ -54,18 +54,18 @@ EOF
return 1 return 1
fi fi
local errcolor failcolor elapsed local errcolor failcolor elapsed
elapsed=$(expr $(date "+%s") - $SHUNIT_TIMERSTART) elapsed=$(expr $(date "+%s") - $TUNIT_TIMERSTART)
errcolor="${COLOR_GREEN}" errcolor="${COLOR_GREEN}"
failcolor="${COLOR_GREEN}" failcolor="${COLOR_GREEN}"
if [ $SHUNIT_ERRORS -gt 0 ]; then if [ $TUNIT_ERRORS -gt 0 ]; then
errcolor="${COLOR_RED}" errcolor="${COLOR_RED}"
fi fi
if [ $SHUNIT_FAILURES -gt 0 ]; then if [ $TUNIT_FAILURES -gt 0 ]; then
failcolor="${COLOR_RED}" failcolor="${COLOR_RED}"
fi fi
echo echo
echo "==== $SHUNIT_TESTS TESTS in $elapsed SECONDS : ${errcolor}$SHUNIT_ERRORS ERRORS${COLOR_NORMAL}, ${errcolor}$SHUNIT_FAILURES FAILURES${COLOR_NORMAL} ====" echo "==== $TUNIT_TESTS TESTS in $elapsed SECONDS : ${errcolor}$TUNIT_ERRORS ERRORS${COLOR_NORMAL}, ${errcolor}$TUNIT_FAILURES FAILURES${COLOR_NORMAL} ===="
return 0 return 0
} }
@@ -96,11 +96,11 @@ EOF
failmsg="$5" failmsg="$5"
cdata="$6" cdata="$6"
SHUNIT_TESTS=$(expr $SHUNIT_TESTS + 1) TUNIT_TESTS=$(expr $TUNIT_TESTS + 1)
printf "[$classname] $testname .... " printf "[$classname] $testname .... "
if [ "$failtype" != "" ]; then if [ "$failtype" != "" ]; then
SHUNIT_ERRORS=$(expr $SHUNIT_ERRORS + 1) TUNIT_ERRORS=$(expr $TUNIT_ERRORS + 1)
SHUNIT_FAILURES=$(expr $SHUNIT_FAILURES + 1) TUNIT_FAILURES=$(expr $TUNIT_FAILURES + 1)
echo "${COLOR_RED}[FAILED]" echo "${COLOR_RED}[FAILED]"
echo " $failtype : $failmsg" echo " $failtype : $failmsg"
echo "$cdata" | sed s/"^"/" "/g echo "$cdata" | sed s/"^"/" "/g