From 5c7cf1cc5358d137160be1619981e7eea9a7402f Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 24 Oct 2017 04:12:18 -0400 Subject: VCL-LDPRELOAD: statically link vppcom into libvcl-ldpreload.so - Move VCL & VCL-LDPRELOAD source into src/vcl - Statically link vppcom into libvcl-ldpreload.so Change-Id: I778300b37e8b06640d9dbc01caf297edf7a6edb7 Signed-off-by: Dave Wallace --- extras/vcl-ldpreload/test/wget_test.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'extras/vcl-ldpreload/test/wget_test.sh') diff --git a/extras/vcl-ldpreload/test/wget_test.sh b/extras/vcl-ldpreload/test/wget_test.sh index f85065b0d9b..a2663d71158 100755 --- a/extras/vcl-ldpreload/test/wget_test.sh +++ b/extras/vcl-ldpreload/test/wget_test.sh @@ -13,12 +13,10 @@ if [ -z "$WS_ROOT" ] ; then echo " Please set WS_ROOT to VPP workspace root directory." >&2 exit 1 fi -if [ -z "$LDP_DIR" ] ; then - echo "WARNING: LDP_DIR environment variable is not set!" - echo " Sourcing $WS_ROOT/extras/vcl-ldpreload/env.sh" - source $WS_ROOT/extras/vcl-ldpreload/env.sh -fi -TEST_APP="${TEST_APP:-wget}" +LDP_DIR="${WS_ROOT}/extras/vcl-ldpreload" LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}" +VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib64}" + +TEST_APP="${TEST_APP:-wget}" source $LDP_TEST_DIR/common/nginx_test.sh -- cgit 1.2.3-korg