X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Funit_test.ksh;h=575c1d85611ede7bb9753ae5a4e43e1793ed67b4;hb=8c6756d9d6f94beca0bc382f97383ca5e79d16c7;hp=ad21465c9fb137ad4663a1c2bd0c9442e2bb8c2b;hpb=ca366b18fa2887300361abc2539f23c068601598;p=ric-plt%2Flib%2Frmr.git diff --git a/test/unit_test.ksh b/test/unit_test.ksh index ad21465..575c1d8 100755 --- a/test/unit_test.ksh +++ b/test/unit_test.ksh @@ -71,6 +71,9 @@ function usage { echo " -c allows user to set the target coverage for a module to pass; default is 80" echo " -f forces a discount check (normally done only if coverage < target)" echo " -F show only failures at the function level" + echo " -Q turns off quiet mode. Quiet mode (default) is less chatty about intermediate" + echo " coverage results and test programme output when failures detected" + echo " -q enable quiet mode (default, so this is no longer needed)" echo " -s strict mode; code coverage must also pass to result in a good exit code" echo " -v will write additional information to the tty and save the disccounted file if discount run or -f given" echo " -x generates the coverage XML files for Sonar (implies -f)" @@ -190,7 +193,7 @@ function discount_an_checks { } } - /-:/ { # skip unexecutable lines + /-:/ { # skip unexecutable lines spit_line() seq++ # allow blank lines in a sequence group next @@ -342,10 +345,11 @@ verbose=0 show_all=1 # show all things -F sets to show failures only strict=0 # -s (strict) will set; when off, coverage state ignored in final pass/fail show_output=0 # show output from each test execution (-S) -quiet=0 +quiet=1 # less chatty with result output (only overall coverage, no intermediate coverage) -Q turns off gen_xml=0 replace_flags=1 # replace ##### in gcov for discounted lines -run_nano_tests=0 +run_nano_tests=0 # can nolonger be turned on +run_nng_tests=0 # -N will enable always_gcov=0 # -a sets to always run gcov even if failure save_gcov=1 # -o turns this off out_dir=${UT_COVERAGE_DIR:-/tmp/rmr_gcov} # -O changes output directory @@ -360,7 +364,7 @@ do -C) builder="$2"; shift;; # custom build command -G) builder="gmake %s";; -M) builder="mk -a %s";; # use plan-9 mk (better, but sadly not widly used) - -N) run_nano_tests=1;; + -N) run_nng_tests=1;; -O) out_dir=$2; shift;; -a) always_gcov=1;; @@ -378,6 +382,7 @@ do -S) show_output=1;; # test output shown even on success -v) (( verbose++ ));; -q) quiet=1;; # less chatty when spilling error log files + -Q) quiet=0;; # disable quiet mode -x) gen_xml=1 force_discounting=1 trigger_discount_str="WARN|FAIL|PASS" # check all outcomes for each module @@ -385,9 +390,9 @@ do ;; - -h) usage; exit 0;; + -h) usage; exit 0;; --help) usage; exit 0;; - -\?) usage; exit 0;; + -\?) usage; exit 0;; *) echo "unrecognised option: $1" >&2 usage >&2 @@ -399,7 +404,7 @@ do done -if (( strict )) # if in strict mode, coverage shortcomings are failures +if (( strict )) # if in strict mode, coverage shortcomings are failures then cfail="FAIL" else @@ -418,11 +423,19 @@ then do if [[ $tfile != *"static_test.c" ]] then - if(( ! run_nano_tests )) && [[ $tfile == *"nano"* ]] + if (( ! run_nng_tests )) && [[ $tfile == *"nng"* ]] # drop any nng file unless -N given + then + continue + fi + if [[ $tfile == *"nano"* ]] # no longer support nano tests; drop regardless then continue fi + if (( ! quiet )) + then + echo " add test: $tfile" >&2 + fi flist="${flist}$tfile " fi done @@ -430,7 +443,6 @@ else flist="$@" fi - if (( noexec )) then echo "no exec mode; would test these:" @@ -445,6 +457,11 @@ rm -fr *.gcov # ditch the previous coverage files ut_errors=0 # unit test errors (not coverage errors) errors=0 +if ! touch /tmp/PPID$$.noise +then + echo " unable to write to /tmp???" +fi + for tfile in $flist do for x in *.gcov @@ -455,14 +472,14 @@ do fi done + echo "$tfile --------------------------------------" ( # all noise is now captured into a tmp file to support quiet mode - echo "$tfile --------------------------------------" bcmd=$( printf "$builder" "${tfile%.c}" ) if ! $bcmd >/tmp/PID$$.log 2>&1 then echo "[FAIL] cannot build $tfile" cat /tmp/PID$$.log - rm -f /tmp/PID$$ + # do NOT remove tmp files; bash seens to not gen a new PID for subshells exit 1 fi @@ -511,6 +528,8 @@ do printf "\n============= test programme output =======================\n" cat /tmp/PID$$.log printf "===========================================================\n" + else + grep "SUMMARY" /tmp/PID$$.log fi fi @@ -612,7 +631,6 @@ do } } } - } END { @@ -623,9 +641,9 @@ do rc=$? cat /tmp/PID$$.log - if (( rc || force_discounting )) # didn't pass, or forcing, see if discounting helps + if (( rc || force_discounting )) # didn't pass, or forcing, see if discounting helps then - if (( ! verbose )) + if (( ! verbose )) # if verbose is on we don't need this (! is not a mistake!!) then echo "[INFO] checking to see if discounting improves coverage for failures listed above" fi @@ -645,7 +663,7 @@ do tail -1 /tmp/PID$$.disc | grep '\[' - if (( verbose > 1 )) # updated file was generated, keep here + if (( verbose > 1 )) # updated file was generated, keep here then echo "[INFO] discounted coverage info in: ${tfile##*/}.dcov" fi @@ -653,7 +671,7 @@ do mv /tmp/PID$$.disc ${name##*/}.dcov done fi - )>/tmp/PID$$.noise 2>&1 + )>/tmp/PID$$.noise 2>&1 if (( $? != 0 )) then (( ut_errors++ )) @@ -674,6 +692,8 @@ do if (( ! quiet )) then cat /tmp/PID$$.noise + else + grep "SUMMARY" /tmp/PID$$.noise fi done @@ -685,7 +705,7 @@ do if [[ $xx != *"test"* ]] then of=${xx%.gcov}.dcov - discount_an_checks $xx >$of + discount_an_checks $xx >$of if [[ -n $of ]] then tail -1 $of | grep '\[' @@ -733,6 +753,16 @@ else # not strict; fail only if unit tests themselves failed fi fi +# finally run any "vetters" which run programmes and analyse the output +echo "[INFO] running vetters...." +if ! make vet +then + echo "[FAIL] one or more vetters failed" + state=1 +else + echo "[INFO] vetters all passed" +fi + echo"" if (( state )) then