diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-10-16 16:44:37 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2017-10-17 16:09:23 +0000 |
| commit | 68a40c868d84284ce5a4d048a2a1a1415a5a24f8 (patch) | |
| tree | 517792c04f8effbb5bead788e85cb0e1769e76db | |
| parent | 556033a0695cd89dd82a92c1f2e3821d876b8749 (diff) | |
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>
| -rw-r--r-- | extras/vcl-ldpreload/env.sh | 8 | ||||
| -rwxr-xr-x | test/scripts/socket_test.sh | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/extras/vcl-ldpreload/env.sh b/extras/vcl-ldpreload/env.sh index ebd3cc0d614..b0df547dbd2 100644 --- 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 5c3ea1cdb5a..84133cc903b 100755 --- 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 |