aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYalei Wang <william.wangyalei@huawei.com>2018-09-20 16:46:29 +0800
committerDave Wallace <dwallacelf@gmail.com>2018-10-01 13:48:41 +0000
commit904a850899db0a40bf885d2ee2e839a5f8dfbeb3 (patch)
tree85e8ec1b919a19de1b1cedc57c68941c13e25bad
parent5d64c7868f67749a6c99eb4ee5998b518ab6c71c (diff)
Fix the path error inside vcl socket_test.sh
Change-Id: I5bcfbd436839e7a6dd82dc57cdb3b7fb6200a69c Signed-off-by: Yalei Wang <william.wangyalei@huawei.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
-rw-r--r--extras/vcl-ldpreload/README.md4
-rwxr-xr-xtest/scripts/socket_test.sh20
2 files changed, 13 insertions, 11 deletions
diff --git a/extras/vcl-ldpreload/README.md b/extras/vcl-ldpreload/README.md
index c07b4184be8..81c86f648c8 100644
--- a/extras/vcl-ldpreload/README.md
+++ b/extras/vcl-ldpreload/README.md
@@ -2,8 +2,8 @@
User can LD_PRELOAD any application that uses POSIX socket API.
-NOTE: The sources have been moved to .../vpp/src/vcl and libvcl_ldpreload.so
- libvcl-ldpreload.so is built with VPP and can be found in
+NOTE: The sources have been moved to .../vpp/src/vcl and
+ libvcl_ldpreload.so is built with VPP and can be found in
.../vpp/build-root/install-vpp[_debug]-native/vpp/lib
## HowTo
diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh
index 33565e40838..f408ad44d82 100755
--- a/test/scripts/socket_test.sh
+++ b/test/scripts/socket_test.sh
@@ -3,8 +3,8 @@
# socket_test.sh -- script to run socket tests.
#
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-vpp_dir="$WS_ROOT/build-root/install-vpp-native/vpp/bin/"
-vpp_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/bin/"
+vpp_dir="$WS_ROOT/build-root/build-vpp-native/vpp/bin/"
+vpp_debug_dir="$WS_ROOT/build-root/build-vpp_debug-native/vpp/bin/"
vpp_shm_dir="/dev/shm/"
vpp_run_dir="/run/vpp"
lib_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib/"
@@ -14,7 +14,7 @@ docker_vpp_dir="/vpp/"
docker_app_dir="/vpp/"
docker_lib_dir="/vpp-lib/"
docker_os="ubuntu"
-vcl_ldpreload_lib="libvcl_ldpreload.so.0.0.0"
+vcl_ldpreload_lib="libvcl_ldpreload.so"
user_gid="$(id -g)"
vpp_app="vpp"
sock_srvr_app="sock_test_server"
@@ -236,16 +236,16 @@ while ! [[ $run_test ]] && (( $# > 0 )) ; do
"np" | "native-preload")
run_test="native_preload" ;;
"nv" | "native-vcl")
- sock_srvr_app="bin/vcl_test_server"
- sock_clnt_app="bin/vcl_test_client"
+ sock_srvr_app="vcl_test_server"
+ sock_clnt_app="vcl_test_client"
run_test="native_vcl" ;;
"dk" | "docker-kernel")
run_test="docker_kernel" ;;
"dp" | "docker-preload")
run_test="docker_preload" ;;
"dv" | "docker-vcl")
- sock_srvr_app="bin/vcl_test_server"
- sock_clnt_app="bin/vcl_test_client"
+ sock_srvr_app="vcl_test_server"
+ sock_clnt_app="vcl_test_client"
run_test="docker_vcl" ;;
*)
echo "ERROR: Unknown option '$1'!" >&2
@@ -303,13 +303,13 @@ if [ ! -f $vpp_dir$vpp_app ] ; then
fi
if [ ! -f $vpp_dir$sock_srvr_app ] && [ ! $iperf3 -eq 1 ] ; then
- echo "ERROR: Missing$title_dbg Socket Server Application!" >&2
+ echo "ERROR: Missing SERVER$title_dbg Socket Server Application!" >&2
echo " $vpp_dir$sock_srvr_app" >&2
env_test_failed="true"
fi
if [ ! -f $vpp_dir$sock_clnt_app ] && [ ! $iperf3 -eq 1 ] ; then
- echo "ERROR: Missing$title_dbg Socket Client Application!" >&2
+ echo "ERROR: Missing CLIENT$title_dbg Socket Client Application!" >&2
echo " $vpp_dir$sock_clnt_app" >&2
env_test_failed="true"
fi
@@ -519,6 +519,8 @@ EOF
fi
cat <<EOF >> $tmp_vpp_exec_file
+create tap id 0
+set int ip addr tap0 172.17.0.2/24
show version
show version verbose
show cpu