From 4c42c80d426a3499ca47ce1849032cda1bd5ff8f Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Mon, 13 May 2019 15:03:36 +0000 Subject: [PATCH] test(app): Support lib64 based Linix flavours Some flavours of Linux default to installing libraries in lib64 rather than using lib as the default hardware type and libXX as alternate architecture formats. These changes allow the application oriented test scripts to find the RMr libraries in the build directory regardless of the choice of the underlying system. Change-Id: I74aa982d7934f9c7dc7a5e86bbd1fa678c8dec61 Signed-off-by: E. Scott Daniels --- test/app_test/Makefile | 2 +- test/app_test/rebuild.ksh | 2 +- test/app_test/run_app_test.ksh | 12 +++++++++--- test/app_test/run_multi_test.ksh | 17 +++++++++++------ test/app_test/run_rr_test.ksh | 13 +++++++++---- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/test/app_test/Makefile b/test/app_test/Makefile index cd6933e..f05f49e 100644 --- a/test/app_test/Makefile +++ b/test/app_test/Makefile @@ -22,7 +22,7 @@ .EXPORT_ALL_VARIABLES: .ONESHELL: -.SHELLFLAGS = -e +#.SHELLFLAGS = -e # hosed on some flavours so keep it off SHELL = /bin/ksh build_path ?= ../../.build diff --git a/test/app_test/rebuild.ksh b/test/app_test/rebuild.ksh index 3e06c2c..cacfd8f 100644 --- a/test/app_test/rebuild.ksh +++ b/test/app_test/rebuild.ksh @@ -20,7 +20,7 @@ # --------------------------------------------------------------------------------- # Mnemonic: rebuild.ksh -# Abstract: This is a simple script that will cause RMr to be rebuilt. It +# Abstract: This is a simple script that will cause RMr to be rebuilt. It # may be invoked by any of the run_* scripts in this directory. # # Date: 24 April 2019 diff --git a/test/app_test/run_app_test.ksh b/test/app_test/run_app_test.ksh index 3c4f20e..90ef2cf 100644 --- a/test/app_test/run_app_test.ksh +++ b/test/app_test/run_app_test.ksh @@ -77,7 +77,7 @@ verbose=0 while [[ $1 == -* ]] do - case $1 in + case $1 in -B) rebuild=1;; -d) delay=$2; shift;; -N) nano_sender=1 @@ -102,7 +102,7 @@ then export RMR_VCTL_FILE=".verbose" fi -if (( rebuild )) +if (( rebuild )) then build_path=../../.build set -e @@ -119,7 +119,13 @@ 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=${RMR_SEED_RT:-./local.rt} # allow easy testing with different rt diff --git a/test/app_test/run_multi_test.ksh b/test/app_test/run_multi_test.ksh index 9bfc59b..ef29336 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 @@ -116,7 +116,7 @@ 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;; -d) delay=$2; shift;; -N) nano_sender=1 @@ -142,7 +142,7 @@ 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 @@ -159,7 +159,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 diff --git a/test/app_test/run_rr_test.ksh b/test/app_test/run_rr_test.ksh index 2e52aa6..3727cc2 100644 --- a/test/app_test/run_rr_test.ksh +++ b/test/app_test/run_rr_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 round robin to all of the receivers. # The number of messages command line parameter (-n) will be the number @@ -118,7 +118,7 @@ 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;; -d) delay=$2; shift;; -N) nano_sender=1 @@ -145,7 +145,7 @@ then export RMR_VCTL_FILE=".verbose" fi -if (( rebuild )) +if (( rebuild )) then build_path=../../.build set -e @@ -162,7 +162,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=./rr.rt -- 2.16.6