X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fapp_test%2Frun_app_test.ksh;h=65adf686db5dade0b48cf4d6e9a568ccae8a8951;hb=02e8d49f42d94b51494977aa0d6f67479f1ceb1c;hp=f83270af7c35249c130aacf554198aa1f48322b8;hpb=5200efe1e6dd13b1e1241ce623c4978151be34e8;p=ric-plt%2Flib%2Frmr.git diff --git a/test/app_test/run_app_test.ksh b/test/app_test/run_app_test.ksh index f83270a..65adf68 100644 --- a/test/app_test/run_app_test.ksh +++ b/test/app_test/run_app_test.ksh @@ -1,8 +1,8 @@ #!/usr/bin/env ksh # vim: ts=4 sw=4 noet : #================================================================================== -# Copyright (c) 2019 Nokia -# Copyright (c) 2018-2019 AT&T Intellectual Property. +# Copyright (c) 2019-2020 Nokia +# Copyright (c) 2018-2020 AT&T Intellectual Property. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ # file in order for the 'main' to pick them up easily. # function run_sender { - ./sender $nmsg $delay + ./sender${si} $nmsg $delay echo $? >/tmp/PID$$.src # must communicate state back via file b/c asynch } @@ -47,9 +47,9 @@ function run_rcvr { if (( mt_receiver )) then echo " testing with mt-receiver" >&2 - ./mt_receiver $nmsg + ./mt_receiver${si} $nmsg else - ./receiver $nmsg + ./receiver${si} $nmsg fi echo $? >/tmp/PID$$.rrc } @@ -108,6 +108,7 @@ my_ip=$(snarf_ip) # get an ip to insert into the route table keep=0 mt_receiver=0 # -m sets in order to test with multi-threaded receive stuff force_make=0 +si="" # -S sets to build and test SI versions while [[ $1 == -* ]] @@ -121,15 +122,18 @@ do -M) force_make=1;; -m) mt_receiver=1;; -n) nmsg=$2; shift;; + -N) si="";; # build and test NNG versions (off si) + -S) si="_si";; # build and test SI95 versions -v) verbose=1;; *) echo "unrecognised option: $1" - echo "usage: $0 [-B] [-d micor-sec-delay] [-i] [-k] [-M] [-m] [-n num-msgs]" + echo "usage: $0 [-B] [-d micor-sec-delay] [-i] [-k] [-M] [-m] [-n num-msgs] [-S]" echo " -B forces an RMR rebuild which will use .build" echo " -i causes the installd libraries (/usr/local) to be referenced; -B is ignored if supplied" echo " -k keeps the route table" echo " -M force make on test applications" echo " -m test with mt-receive mode" + echo " -S build/test SI95 based binaries" echo "" echo "total number of messages must > 20 to correctly test hairpin loop removal" exit 1 @@ -188,11 +192,11 @@ fi export RMR_SEED_RT=${RMR_SEED_RT:-./app_test.rt} # allow easy testing with different rt -if (( force_make )) || [[ ! -f ./sender || ! -f ./receiver ]] +if (( force_make )) || [[ ! -f ./sender${si} || ! -f ./receiver${si} ]] then - if ! make -B >/dev/null 2>&1 + if ! make -B sender${si} receiver${si} >/dev/null 2>&1 then - echo "[FAIL] cannot find sender binary, and cannot make it.... humm?" + echo "[FAIL] cannot find sender${si} and/or receiver${si}binary, and cannot make them.... humm?" exit 1 fi fi