X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvcl-ldpreload%2Ftest%2Fcommon%2Fnginx_test.sh;h=6d43abf2d1037e3a07f24e7dbabfcc7d405a1079;hb=5c7cf1cc5358d137160be1619981e7eea9a7402f;hp=7c43324dbc8a33d8384e2873dfabf8ffa288089c;hpb=80b48a61b8781b41b5c2eeca482c2778562422f4;p=vpp.git

diff --git a/extras/vcl-ldpreload/test/common/nginx_test.sh b/extras/vcl-ldpreload/test/common/nginx_test.sh
index 7c43324dbc8..6d43abf2d10 100755
--- a/extras/vcl-ldpreload/test/common/nginx_test.sh
+++ b/extras/vcl-ldpreload/test/common/nginx_test.sh
@@ -29,19 +29,22 @@ 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
+
+if [ -z "$VCL_LDPRELOAD_LIB_DIR" ] ; then
+    echo "ERROR: VCL_LDPRELOAD_LIB_DIR environment variable not set!" >&2
+    echo "       Please set VCL_LDPRELOAD_LIB_DIR to " >&2
+    echo "       $WS_ROOT/build-root/install-vpp[_debug]-native/vpp/lib64." >&2
+    exit 1
 fi
 
 TEST_APP="${TEST_APP:-curl}"
+LDP_DIR="${WS_ROOT}/extras/vcl-ldpreload"
 LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}"
 LDP_LIB="${LDP_LIB:-${VCL_LDPRELOAD_LIB_DIR}/libvcl_ldpreload.so.0.0.0}"
 
 if [ ! -f "$LDP_LIB" ] ; then
     echo "ERROR: Missing VCL-LDPRELOAD Library: $LDP_LIB"
-    echo "       See $LDP_DIR/README.md for build instructions!"
+    echo "       Run 'cd $WS_ROOT; make build[-release] ' !"
     exit 1
 fi
 
@@ -53,7 +56,9 @@ if [ -z "$(docker ps -qf name=$vpp_dk_name)" ] ; then
     sudo ip link del dev vpp_dk
     sudo ip link add name vpp_dk type veth peer name vpp1
     sudo ip link set dev vpp_dk up
+    sudo ethtool --offload vpp_dk rx off tx off
     sudo ip link set dev vpp1 up
+    sudo ethtool --offload vpp1 rx off tx off
     sudo ip link set dev lo up
     sudo brctl addif docker0 vpp_dk
 fi