X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_call_test.sh;fp=test%2Fapp_test%2Frun_call_test.ksh;h=64ed70eae87395a095839459cc9f953859748bc7;hb=1739800d21456ddb0b0efbf92cb6d60c6f772feb;hp=10285231c499f50df5fcc05ad4ef9b6941d52f03;hpb=338fe5e46223df8145b53cdf52dab358f18c7f26;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_call_test.ksh b/test/app_test/run_call_test.sh
similarity index 91%
rename from test/app_test/run_call_test.ksh
rename to test/app_test/run_call_test.sh
index 1028523..64ed70e 100644
--- a/test/app_test/run_call_test.ksh
+++ b/test/app_test/run_call_test.sh
@@ -170,18 +170,21 @@ else
 	fi
 fi
 
-if (( dev_base ))							# assume we are testing against what we've built, not what is installed
+if [[ -z $LD_LIBRARY_PATH ]]					# cmake test will set and it must be honoured
 then
-	if [[ -d $build_path/lib64 ]]
+	if (( dev_base ))							# assume we are testing against what we've built, not what is installed
 	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
+		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
+	else										# -D option gets us here to test an installed library
+		export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+		export LIBRARY_PATH=$LD_LIBRARY_PATH
 	fi
-	export LIBRARY_PATH=$LD_LIBRARY_PATH
-else										# -D option gets us here to test an installed library
-	export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-	export LIBRARY_PATH=$LD_LIBRARY_PATH
 fi
 
 export RMR_SEED_RT=${RMR_SEED_RT:-./caller.rt}		# allow easy testing with different rt