VCL: refactor VCL_LDPRELOAD env vars.

- Update vcl-ldpreload references to use $WS_ROOT.

Change-Id: I8e79f7c5e330eda6548a2baf84613b0a4d360811
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/extras/vcl-ldpreload/env.sh b/extras/vcl-ldpreload/env.sh
index ebd3cc0..b0df547 100644 (file)
--- a/extras/vcl-ldpreload/env.sh
+++ b/extras/vcl-ldpreload/env.sh
@@ -1,5 +1,3 @@
-export VCL_BASE=$PWD/../../..
-export VPP_DIR=$VCL_BASE/vpp
-export LDP_DIR=$VCL_BASE/vpp/extras
-export WS_ROOT=$VCL_BASE/vpp
-export VCL_LDPRELOAD_LIB_DIR=$LDP_DIR/vcl-ldpreload/src/.libs
+export VPP_DIR=$WS_ROOT
+export LDP_DIR=$WS_ROOT/extras/vcl-ldpreload
+export VCL_LDPRELOAD_LIB_DIR=$LDP_DIR/src/.libs

diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh
index 5c3ea1c..84133cc 100755 (executable)
--- a/test/scripts/socket_test.sh
+++ b/test/scripts/socket_test.sh
@@ -49,7 +49,7 @@ trap_signals="SIGINT SIGTERM EXIT"
 VPP_GDB_CMDFILE="${VPP_GDB_CMDFILE:-${def_gdb_cmdfile_prefix}.vpp}"
 VPPCOM_CLIENT_GDB_CMDFILE="${VPPCOM_CLIENT_GDB_CMDFILE:-${def_gdb_cmdfile_prefix}.vppcom_client}"
 VPPCOM_SERVER_GDB_CMDFILE="${VPPCOM_SERVER_GDB_CMDFILE:-${def_gdb_cmdfile_prefix}.vppcom_server}"
-VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-/usr/local/lib}"
+VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$WS_ROOT/extras/vcl-ldpreload/src/.libs}"
 
 usage() {
     cat <<EOF