X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_rr_test.ksh;h=62aae3b5e0cbca6d6ab76b43255a68537a073d36;hb=refs%2Ftags%2F3.3.0;hp=2e52aa6635ac1f3b98da5d56c29d1847e6f66879;hpb=a41c6f5f26b3a44009f4aff3df3f83b9a79ace01;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_rr_test.ksh b/test/app_test/run_rr_test.ksh
index 2e52aa6..62aae3b 100644
--- a/test/app_test/run_rr_test.ksh
+++ b/test/app_test/run_rr_test.ksh
@@ -1,8 +1,8 @@
 #!/usr/bin/env ksh
-# :vi ts=4 sw=4 noet :
+# 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.
@@ -21,7 +21,7 @@
 # ---------------------------------------------------------------------------------
 #	Mnemonic:	run_multi_test.ksh
 #	Abstract:	This is a simple script to set up and run the basic send/receive
-#				processes for some library validation on top of nano/nng. This 
+#				processes for some library validation on top of nng. This
 #				particular tests starts several receivers and creates a route table
 #				which causes messages to be sent round robin to all of the receivers.
 #				The number of messages command line parameter (-n) will be the number
@@ -31,7 +31,6 @@
 #
 #				Example command line:
 #					ksh ./run_rr_test.ksh		# default 10 messages at 1 msg/sec
-#					ksh ./run_rr_test.ksh -N    # default but with nanomsg lib
 #					ksh ./run_rr_test.ksh -d 100 -n 10000 # send 10k messages with 100ms delay between
 #
 #	Date:		24 April 2019
@@ -44,12 +43,7 @@
 #
 function run_sender {
 	export RMR_RTG_SVC=8990
-	if (( $nano_sender ))
-	then
-		./sender_nano $(( nmsg * nrcvrs )) $delay 1
-	else
-		./sender $(( nmsg * nrcvrs ))  $delay 1
-	fi
+	./sender${si} $(( nmsg * nrcvrs ))  $delay $max_mtype
 	echo $? >/tmp/PID$$.src		# must communicate state back via file b/c asynch
 }
 
@@ -59,12 +53,7 @@ function run_rcvr {
 
 	port=$(( 4560 + ${1:-0} ))
 	export RMR_RTG_SVC=$(( 9990 + $1 ))
-	if (( $nano_receiver ))
-	then
-		./receiver_nano $nmsg $port
-	else
-		./receiver $nmsg $port
-	fi
+	./receiver${si} $nmsg $port
 	echo $? >/tmp/PID$$.$1.rrc
 }
 
@@ -85,15 +74,15 @@ function set_rt {
 		rte |0 | $endpoints  |0
 		rte |1 | $endpoints  |10
 		mse |2 | 20 | $endpoints		# new style mtype/subid entry
-		rte |3 | $endpoints  |0
-		rte |4 | $endpoints  |0
-		rte |5 | $endpoints  |0
-		rte |6 | $endpoints  |0
-		rte |7 | $endpoints  |0
-		rte |8 | $endpoints  |0
-		rte |9 | $endpoints  |0
-		rte |10 | $endpoints  |0
-		rte |11 | $endpoints  |0
+		rte |3 | $endpoints  | -1
+		rte |4 | $endpoints  | -1
+		rte |5 | $endpoints  | -1
+		rte |6 | $endpoints  | -1
+		rte |7 | $endpoints  | -1
+		rte |8 | $endpoints  | -1
+		rte |9 | $endpoints  | -1
+		rte |10 | $endpoints  | -1
+		rte |11 | $endpoints  | -1
 		newrt |end
 endKat
 
@@ -107,30 +96,37 @@ then
 	sed "s!%%hostname%%!$hn!" rt.mask >local.rt
 fi
 
+export RMR_ASYNC_CONN=0 	# ensure we don't lose first msg as drops waiting for conn look like errors
 nmsg=10						# total number of messages to be exchanged (-n value changes)
 delay=1000					# microsec sleep between msg 1,000,000 == 1s (shorter than others b/c/ we are sending to multiple)
-nano_sender=0				# start nano version if set (-N)
-nano_receiver=0
 wait=1
 rebuild=0
+nopull=""
 verbose=0
+max_mtype=1					# causes all msgs to go with type 1; use -M to set up, but likely harder to validate
 nrcvrs=3					# this is sane, but -r allows it to be set up
+force_make=0
+si=""
 
 while [[ $1 == -* ]]
 do
-	case $1 in 
+	case $1 in
 		-B)	rebuild=1;;
+		-b)	rebuild=1; nopull="nopull";;		# build without pulling
 		-d)	delay=$2; shift;;
-		-N)	nano_sender=1
-			nano_receiver=1
-			;;
+		-m) max_mtype=$2; shift;;
+		-M) force_make=1;;
 		-n)	nmsg=$2; shift;;
+		-N)	si="";;								# build/run NNG binaries
 		-r)	nrcvrs=$2; shift;;
+		-S)	si="_si";;							# build/run SI95 binaries
 		-v)	verbose=1;;
 
 		*)	echo "unrecognised option: $1"
-			echo "usage: $0 [-B] [-d micor-sec-delay] [-N] [-n num-msgs]"
+			echo "usage: $0 [-B] [-d micor-sec-delay] [-M] [-n num-msgs] [-S]"
 			echo "  -B forces a rebuild which will use .build"
+			echo "  -M force test applications to be remade"
+			echo "  -S build/test SI95 based binaries"
 			exit 1
 			;;
 	esac
@@ -138,18 +134,16 @@ do
 	shift
 done
 
-
 if (( verbose ))
 then
 	echo "2" >.verbose
 	export RMR_VCTL_FILE=".verbose"
 fi
 
-if (( rebuild )) 
+if (( rebuild ))
 then
-	build_path=../../.build
 	set -e
-	ksh ./rebuild.ksh
+	$SHELL ./rebuild.ksh $nopull | read build_path
 	set +e
 else
 	build_path=${BUILD_PATH:-"../../.build"}	# we prefer .build at the root level, but allow user option
@@ -162,17 +156,22 @@ else
 	fi
 fi
 
-export LD_LIBRARY_PATH=$build_path:$build_path/lib
+if [[ -d $build_path/lib64 ]]
+then
+	export LD_LIBRARY_PATH=$build_path:$build_path/lib64:$LD_LIBRARY_PATH
+else
+	export LD_LIBRARY_PATH=$build_path:$build_path/lib:$LD_LIBRARY_PATH
+fi
 export LIBRARY_PATH=$LD_LIBRARY_PATH
 export RMR_SEED_RT=./rr.rt
 
 set_rt $nrcvrs
 
-if [[ ! -f ./sender ]]
+if (( rebuild || force_make )) || [[ ! -f ./sender${si} || ! -f ./receiver${si} ]]
 then
 	if ! make >/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