X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvcl-ldpreload%2Ftest%2Fcurl_test.sh;h=24b0c6e06d152ed772c9bc351b820ad736e46c88;hb=5c7cf1cc5358d137160be1619981e7eea9a7402f;hp=c0d88d7af4a215b5ab13005ae696428487e448d5;hpb=4c151b5fa13312639b0a5ef0d0efb1866bf4ed5e;p=vpp.git diff --git a/extras/vcl-ldpreload/test/curl_test.sh b/extras/vcl-ldpreload/test/curl_test.sh index c0d88d7af4a..24b0c6e06d1 100755 --- a/extras/vcl-ldpreload/test/curl_test.sh +++ b/extras/vcl-ldpreload/test/curl_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:-curl}" +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:-curl}" source $LDP_TEST_DIR/common/nginx_test.sh