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 <dwallacelf@gmail.com>
diff --git a/extras/vcl-ldpreload/test/wget_test.sh b/extras/vcl-ldpreload/test/wget_test.sh
index f85065b..a2663d7 100755
--- a/extras/vcl-ldpreload/test/wget_test.sh
+++ b/extras/vcl-ldpreload/test/wget_test.sh
@@ -13,12 +13,10 @@
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
+
+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}"
-LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}"
source $LDP_TEST_DIR/common/nginx_test.sh