X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_lcall_test.ksh;fp=test%2Fapp_test%2Frun_lcall_test.ksh;h=2a34d93341e9130d7454069bdb90ac069c92e8d9;hb=02e8d49f42d94b51494977aa0d6f67479f1ceb1c;hp=b01aba20333fdf319f2c5801bb6927ddb136586c;hpb=5200efe1e6dd13b1e1241ce623c4978151be34e8;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_lcall_test.ksh b/test/app_test/run_lcall_test.ksh
index b01aba2..2a34d93 100644
--- a/test/app_test/run_lcall_test.ksh
+++ b/test/app_test/run_lcall_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.
@@ -51,7 +51,7 @@
 # file in order for the 'main' to pick them up easily.
 #
 function run_sender {
-	./lcaller ${nmsg:-10} ${delay:-500} ${cthreads:-3} 
+	./lcaller${si} ${nmsg:-10} ${delay:-500} ${cthreads:-3} 
 	echo $? >/tmp/PID$$.src		# must communicate state back via file b/c asynch
 }
 
@@ -61,7 +61,7 @@ function run_rcvr {
 
 	port=$(( 4460 + ${1:-0} ))
 	export RMR_RTG_SVC=$(( 9990 + $1 ))
-	./lreceiver $(( ((nmsg * cthreads)/nrcvrs) + 10 )) $port
+	./lreceiver${si} $(( ((nmsg * cthreads)/nrcvrs) + 10 )) $port
 	echo $? >/tmp/PID$$.$1.rrc
 }
 
@@ -111,6 +111,8 @@ rebuild=0
 verbose=0
 nrcvrs=3					# this is sane, but -r allows it to be set up
 use_installed=0
+force_make=0
+si=""
 
 while [[ $1 == -* ]]
 do
@@ -120,13 +122,18 @@ do
 		-d)	delay=$2; shift;;
 		-i)	use_installed=1;;
 		-n)	nmsg=$2; shift;;
+		-M)	force_make=1;;
+		-N)	si="";;					# build NNG binaries (turn off si)
 		-r)	nrcvrs=$2; shift;;
+		-S)	si="_si";;				# build SI95 binaries
 		-v)	verbose=1;;
 
 		*)	echo "unrecognised option: $1"
-			echo "usage: $0 [-B] [-c caller-threads] [-d micor-sec-delay] [-i] [-n num-msgs] [-r num-receivers]"
-			echo "  -B forces a rebuild which will use .build"
+			echo "usage: $0 [-B] [-c caller-threads] [-d micor-sec-delay] [-i] [-M] [-n num-msgs] [-r num-receivers] [-S]"
+			echo "  -B forces an RMR rebuild which will use .build"
 			echo "  -i will use installed libraries (/usr/local) and cause -B to be ignored if supplied)"
+			echo "  -M force test applictions to be remade"
+			echo "  -S build/test SI95 based binaries"
 			exit 1
 			;;
 	esac
@@ -175,11 +182,11 @@ export RMR_SEED_RT=./lcall.rt
 
 set_rt $nrcvrs						# set up the rt for n receivers
 
-if (( rebuild )) || [[ ! -f ./lcaller ]]
+if (( force_make || rebuild )) || [[ ! -f ./lcaller{$si} || ! -f ./lreceiver${si} ]]
 then
-	if ! make -B lcaller lreceiver >/dev/null 2>&1
+	if ! make -B lcaller${si} lreceiver${si} >/dev/null 2>&1
 	then
-		echo "[FAIL] cannot find lcaller binary, and cannot make it.... humm?"
+		echo "[FAIL] cannot find lcaller${si} and/or lreceiver${si} binary, and cannot make them.... humm?"
 		exit 1
 	fi
 fi