X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Funit_test.ksh;h=718055ae7df7d457473abf200c8ddd382e1e9643;hb=373f13d6cecbdc193a894234beef55fd24808280;hp=80712a58e3d073bfa3d7aed316dd7905c6c77782;hpb=fc5c77b3d78988aa407118235d7f5978642df753;p=ric-plt%2Flib%2Frmr.git diff --git a/test/unit_test.ksh b/test/unit_test.ksh index 80712a5..718055a 100755 --- a/test/unit_test.ksh +++ b/test/unit_test.ksh @@ -82,7 +82,7 @@ function usage { function add_ignored_func { if [[ ! -r $1 ]] then - echo ">>>> can't find file to ignore: $1" + echo ">>>> can't find file to ignore: $1" return fi @@ -190,7 +190,7 @@ function discount_an_checks { } } - /-:/ { # skip unexecutable lines + /-:/ { # skip unexecutable lines spit_line() seq++ # allow blank lines in a sequence group next @@ -215,7 +215,6 @@ function discount_an_checks { #printf( "allow discount: %s\n", $0 ) if( replace_flags ) { gsub( "#####", " 1", $0 ) - //gsub( "#####", "=====", $0 ) } discount++; } @@ -312,23 +311,26 @@ function mk_xml { # ----------------------------------------------------------------------------------------------------------------- -# we assume that the project has been built in the ../[.]build directory -if [[ -d ../build ]] +if [[ -z $BUILD_PATH ]] then - export LD_LIBRARY_PATH=../build/lib:../build/lib64 - export C_INCLUDE_PATH=../build/include -else - if [[ -d ../.build ]] - then - export LD_LIBRARY_PATH=../.build/lib:../.build/lib64 - export C_INCLUDE_PATH=../.build/include + # we assume that the project has been built in the ../[.]build directory + if [[ -d ../build ]] + then + export BUILD_PATH=../build else - echo "[WARN] cannot find build directory (tried ../build and ../.build); things might not work" - echo "" + if [[ -d ../.build ]] + then + export BUILD_PATH=../.build + else + echo "[WARN] cannot find build directory (tried ../build and ../.build); things might not work" + echo "" + fi fi fi +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BUILD_PATH/lib:$BUILD_PATH/lib64 +export C_INCLUDE_PATH=$C_INCLUDE_PATH:$BUILD_PATH/include export LIBRARY_PATH=$LD_LIBRARY_PATH # The Makefile sets specific includes for things @@ -343,7 +345,8 @@ show_output=0 # show output from each test execution (-S) quiet=0 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 @@ -358,7 +361,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;; @@ -383,9 +386,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 @@ -397,7 +400,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 @@ -416,11 +419,16 @@ 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 - + + echo " add test: $tfile" >&2 flist="${flist}$tfile " fi done @@ -443,6 +451,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 @@ -453,14 +466,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 @@ -483,7 +496,7 @@ do if ! ./${tfile%.c} >/tmp/PID$$.log 2>&1 then echo "[FAIL] unit test failed for: $tfile" - if [[ -n $capture_file ]] + if [[ -n $capture_file ]] then echo "all errors captured in $capture_file, listing only fail message on tty" echo "$tfile --------------------------------------" >>$capture_file @@ -493,7 +506,7 @@ do else if (( quiet )) then - grep "^<" /tmp/PID$$.log|grep -v "^" # in quiet mode just dump <...> messages which are assumed from the test programme not appl + grep "^<" /tmp/PID$$.log|egrep -v "^|^" # in quiet mode just dump <...> messages which are assumed from the test programme not appl else cat /tmp/PID$$.log fi @@ -501,7 +514,7 @@ do (( ut_errors++ )) # cause failure even if not in strict mode if (( ! always_gcov )) then - continue # skip coverage tests for this + exit 1 # we are in a subshell, must exit bad fi else if (( show_output )) @@ -610,7 +623,6 @@ do } } } - } END { @@ -621,7 +633,7 @@ 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 )) then @@ -643,7 +655,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 @@ -651,7 +663,13 @@ do mv /tmp/PID$$.disc ${name##*/}.dcov done fi - )>/tmp/PID$$.noise 2>&1 + )>/tmp/PID$$.noise 2>&1 + if (( $? != 0 )) + then + (( ut_errors++ )) + cat /tmp/PID$$.noise + continue + fi for x in *.gcov # merge any previous coverage file with this one do @@ -667,7 +685,7 @@ do then cat /tmp/PID$$.noise fi -done +done echo "" echo "[INFO] final discount checks on merged gcov files" @@ -677,7 +695,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 '\['