ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the path error inside vcl socket_test.sh

Browse Source 
Change-Id: I5bcfbd436839e7a6dd82dc57cdb3b7fb6200a69c
Signed-off-by: Yalei Wang <william.wangyalei@huawei.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Yalei Wang
2018-09-20 16:46:29 +08:00
committed by Dave Wallace
parent 5d64c7868f
commit 904a850899
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/vcl-ldpreload/README.md
View File

@ -2,8 +2,8 @@
User can LD_PRELOAD any application that uses POSIX socket API. 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 NOTE: The sources have been moved to .../vpp/src/vcl and
libvcl-ldpreload.so is built with VPP and can be found in libvcl_ldpreload.so is built with VPP and can be found in
.../vpp/build-root/install-vpp[_debug]-native/vpp/lib .../vpp/build-root/install-vpp[_debug]-native/vpp/lib
## HowTo ## HowTo

20
test/scripts/socket_test.sh
View File

@ -3,8 +3,8 @@
# socket_test.sh -- script to run socket tests. # socket_test.sh -- script to run socket tests.
# #
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
vpp_dir="$WS_ROOT/build-root/install-vpp-native/vpp/bin/" vpp_dir="$WS_ROOT/build-root/build-vpp-native/vpp/bin/"
vpp_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/bin/" vpp_debug_dir="$WS_ROOT/build-root/build-vpp_debug-native/vpp/bin/"
vpp_shm_dir="/dev/shm/" vpp_shm_dir="/dev/shm/"
vpp_run_dir="/run/vpp" vpp_run_dir="/run/vpp"
lib_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib/" lib_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib/"
@ -14,7 +14,7 @@ docker_vpp_dir="/vpp/"
docker_app_dir="/vpp/" docker_app_dir="/vpp/"
docker_lib_dir="/vpp-lib/" docker_lib_dir="/vpp-lib/"
docker_os="ubuntu" docker_os="ubuntu"
vcl_ldpreload_lib="libvcl_ldpreload.so.0.0.0" vcl_ldpreload_lib="libvcl_ldpreload.so"
user_gid="$(id -g)" user_gid="$(id -g)"
vpp_app="vpp" vpp_app="vpp"
sock_srvr_app="sock_test_server" sock_srvr_app="sock_test_server"
@ -236,16 +236,16 @@ while ! [[ $run_test ]] && (( $# > 0 )) ; do
"np" | "native-preload") "np" | "native-preload")
run_test="native_preload" ;; run_test="native_preload" ;;
"nv" | "native-vcl") "nv" | "native-vcl")
sock_srvr_app="bin/vcl_test_server" sock_srvr_app="vcl_test_server"
sock_clnt_app="bin/vcl_test_client" sock_clnt_app="vcl_test_client"
run_test="native_vcl" ;; run_test="native_vcl" ;;
"dk" | "docker-kernel") "dk" | "docker-kernel")
run_test="docker_kernel" ;; run_test="docker_kernel" ;;
"dp" | "docker-preload") "dp" | "docker-preload")
run_test="docker_preload" ;; run_test="docker_preload" ;;
"dv" | "docker-vcl") "dv" | "docker-vcl")
sock_srvr_app="bin/vcl_test_server" sock_srvr_app="vcl_test_server"
sock_clnt_app="bin/vcl_test_client" sock_clnt_app="vcl_test_client"
run_test="docker_vcl" ;; run_test="docker_vcl" ;;
*) *)
echo "ERROR: Unknown option '$1'!" >&2 echo "ERROR: Unknown option '$1'!" >&2
@ -303,13 +303,13 @@ if [ ! -f $vpp_dir$vpp_app ] ; then
fi fi
if [ ! -f $vpp_dir$sock_srvr_app ] && [ ! $iperf3 -eq 1 ] ; then 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 echo " $vpp_dir$sock_srvr_app" >&2
env_test_failed="true" env_test_failed="true"
fi fi
if [ ! -f $vpp_dir$sock_clnt_app ] && [ ! $iperf3 -eq 1 ] ; then 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 echo " $vpp_dir$sock_clnt_app" >&2
env_test_failed="true" env_test_failed="true"
fi fi
@ -519,6 +519,8 @@ EOF
fi fi
cat <<EOF >> $tmp_vpp_exec_file cat <<EOF >> $tmp_vpp_exec_file
create tap id 0
set int ip addr tap0 172.17.0.2/24
show version show version
show version verbose show version verbose
show cpu show cpu