Add first set of SI95 unit tests and health check

[ric-plt/lib/rmr.git] / test / app_test / run_lcall_test.ksh

diff --git a/test/app_test/run_lcall_test.ksh b/test/app_test/run_lcall_test.ksh
index 2a34d93..241deb5 100644 (file)
--- a/test/app_test/run_lcall_test.ksh
+++ b/test/app_test/run_lcall_test.ksh
@@ -149,14 +149,13 @@ fi
 
 if (( use_installed ))                 # point at installed library
 then
-       export LD_LIBRARY_PATH=/usr/local/lib
-       export LIBRARY_PATH=$LD_LIBRARY_PATH
+       export LD_LIBRARY_PATH=${LD_LIBRARY_PATH-:/usr/local/lib}       # use caller's or set sane default
 else
        if (( rebuild ))
        then
                build_path=../../.build         # if we rebuild we can insist that it is in .build :)
                set -e
-               ksh ./rebuild.ksh
+               $SHELL ./rebuild.ksh
                set +e
        else
                build_path=${BUILD_PATH:-"../../.build"}        # we prefer .build at the root level, but allow user option
@@ -171,9 +170,9 @@ else
 
        if [[ -d $build_path/lib64 ]]
        then
-               export LD_LIBRARY_PATH=$build_path:$build_path/lib64
+               export LD_LIBRARY_PATH=$build_path:$build_path/lib64:$LD_LIBRARY_PATH
        else
-               export LD_LIBRARY_PATH=$build_path:$build_path/lib
+               export LD_LIBRARY_PATH=$build_path:$build_path/lib:$LD_LIBRARY_PATH
        fi
 fi