X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_multi_test.ksh;h=0bc1e80086f345011bb5e1f28359cc9eae7013b0;hb=e7c40156a4ded17c94bca8fcf4b6a785f144992e;hp=9bfc59b6c87f2394a9fe67b22f007a84db79fc0a;hpb=a41c6f5f26b3a44009f4aff3df3f83b9a79ace01;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_multi_test.ksh b/test/app_test/run_multi_test.ksh
index 9bfc59b..0bc1e80 100644
--- a/test/app_test/run_multi_test.ksh
+++ b/test/app_test/run_multi_test.ksh
@@ -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 nano/nng. This
 #				particular tests starts several receivers and creates a route table
 #				which causes messages to be sent to all receivers in parallel
 #				(forcing message cloning internally in RMr).
@@ -83,8 +83,8 @@ function set_rt {
 		mse |0 | 0 | $groups
 		mse |1 | 10 | $groups
 		mse |2 | 20 | $groups
-		rte |3 | $groups 
-		rte |4 | $groups 
+		rte |3 | $groups
+		rte |4 | $groups
 		rte |5 | $groups
 		rte |6 | $groups
 		rte |7 | $groups
@@ -111,13 +111,15 @@ nano_sender=0				# start nano version if set (-N)
 nano_receiver=0
 wait=1
 rebuild=0
+nopull=""
 verbose=0
 nrcvrs=3					# this is sane, but -r allows it to be set up
 
 while [[ $1 == -* ]]
 do
-	case $1 in 
+	case $1 in
 		-B)	rebuild=1;;
+		-b)	rebuild=1; nopull="nopull";;		# enable build but without pull
 		-d)	delay=$2; shift;;
 		-N)	nano_sender=1
 			nano_receiver=1
@@ -142,11 +144,10 @@ then
 	export RMR_VCTL_FILE=".verbose"
 fi
 
-if (( rebuild )) 
+if (( rebuild ))
 then
-	build_path=../../.build		# if we rebuild we can insist that it is in .build :)
 	set -e
-	ksh ./rebuild.ksh
+	ksh ./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
@@ -159,7 +160,12 @@ 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
+else
+	export LD_LIBRARY_PATH=$build_path:$build_path/lib
+fi
 export LIBRARY_PATH=$LD_LIBRARY_PATH
 export RMR_SEED_RT=./multi.rt