diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-10-24 04:12:18 -0400 |
|---|---|---|
| committer |   Keith Burns <alagalah@gmail.com> | 2017-10-24 18:25:31 +0000 |
| commit | 5c7cf1cc5358d137160be1619981e7eea9a7402f (patch) | |
| tree | e981f6fc831e9c4e240e765d506ac8d58be43123 /extras/vcl-ldpreload/test | |
| parent | 4c151b5fa13312639b0a5ef0d0efb1866bf4ed5e (diff) | |
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>
Diffstat (limited to 'extras/vcl-ldpreload/test')
| -rwxr-xr-x | extras/vcl-ldpreload/test/common/nginx_test.sh | 13 | ||||
| -rwxr-xr-x | extras/vcl-ldpreload/test/curl_test.sh | 10 | ||||
| -rwxr-xr-x | extras/vcl-ldpreload/test/wget_test.sh | 10 |
3 files changed, 16 insertions, 17 deletions
diff --git a/extras/vcl-ldpreload/test/common/nginx_test.sh b/extras/vcl-ldpreload/test/common/nginx_test.sh index 3875d9f579a..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 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 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 |