From 79dcbc74cd417f4caf41bc398ccba94cab7d656b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 12 Sep 2018 14:01:10 +0200 Subject: Always use 'lib' instead of 'lib64' It is packaging responsibility to put libs in the right place. Use of lib64 resulted in huge amount of files with hardcoded lib64. This patch simplifies things... Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6 Signed-off-by: Damjan Marion --- test/ext/Makefile | 6 +++--- test/scripts/socket_test.sh | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'test') diff --git a/test/ext/Makefile b/test/ext/Makefile index a66a72c35dc..4ae56cfc3eb 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -9,7 +9,7 @@ VAPI_CPPBIN= endif VAPI_LIBS = \ - -L$(VPP_TEST_INSTALL_PATH)/vpp/lib64 \ + -L$(VPP_TEST_INSTALL_PATH)/vpp/lib \ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient ifneq ($(filter centos opensuse opensuse-tumbleweed opensuse-leap,$(OS_ID)),$(OS_ID)) @@ -55,7 +55,7 @@ $(VOM_BINDIR): LIB_VOM = -lvom VOM_LIBS = \ - -L$(VPP_TEST_INSTALL_PATH)/vom/lib64 \ + -L$(VPP_TEST_INSTALL_PATH)/vom/lib \ -lvom \ -lboost_thread \ -lboost_system \ @@ -69,7 +69,7 @@ VOM_CPPFLAGS = \ $(CPPFLAGS) $(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR) - $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib64 + $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib $(VOM_BIN).d: $(VOM_CPPSRC) $(VOM_BINDIR) $(CXX) -o $@ $(VOM_CPPFLAGS) -MM -MT '$(VOM_BIN)' $(VOM_CPPSRC) > $@ diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh index 5fd8b5f9db6..1528116bf80 100755 --- a/test/scripts/socket_test.sh +++ b/test/scripts/socket_test.sh @@ -7,12 +7,12 @@ 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_shm_dir="/dev/shm/" vpp_run_dir="/run/vpp" -lib64_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib64/" -lib64_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib64/" +lib_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib/" +lib_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib/" dpdk_devbind="/usr/share/dpdk/usertools/dpdk-devbind.py" docker_vpp_dir="/vpp/" docker_app_dir="/vpp/" -docker_lib64_dir="/vpp-lib64/" +docker_lib_dir="/vpp-lib/" docker_os="ubuntu" vcl_ldpreload_lib="libvcl_ldpreload.so.0.0.0" user_gid="$(id -g)" @@ -144,7 +144,7 @@ while getopts ":hitlbcd6fn:m:e:g:p:E:I:N:P:R:S:T:UBVXD" opt; do ;; d) title_dbg="-DEBUG" vpp_dir=$vpp_debug_dir - lib64_dir=$lib64_debug_dir + lib_dir=$lib_debug_dir ;; e) if [ $OPTARG = "a" ] || [ $OPTARG = "all" ] ; then emacs_client=1 @@ -162,7 +162,7 @@ while getopts ":hitlbcd6fn:m:e:g:p:E:I:N:P:R:S:T:UBVXD" opt; do fi title_dbg="-DEBUG" vpp_dir=$vpp_debug_dir - lib64_dir=$lib64_debug_dir + lib_dir=$lib_debug_dir ;; n) vpp_eth_name="$OPTARG" ;; @@ -262,7 +262,7 @@ if [ -z "$VCL_DEBUG" ] ; then fi fi -VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib64_dir}" +VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib_dir}" if [ -z "$WS_ROOT" ] ; then echo "ERROR: WS_ROOT environment variable not set!" >&2 @@ -282,9 +282,9 @@ if [ ! -d $vpp_dir ] ; then fi if [[ $run_test =~ .*"_preload" ]] ; then - if [ ! -d $lib64_dir ] ; then - echo "ERROR: Missing VPP$title_dbg lib64 directory!" >&2 - echo " $lib64_dir" >&2 + if [ ! -d $lib_dir ] ; then + echo "ERROR: Missing VPP$title_dbg lib directory!" >&2 + echo " $lib_dir" >&2 elif [ ! -d $VCL_LDPRELOAD_LIB_DIR ] ; then echo "ERROR: Missing VCL LD_PRELOAD Library directory!" >&2 echo " $VCL_LDPRELOAD_LIB_DIR" >&2 @@ -499,7 +499,7 @@ EOF echo "ERROR: No inet6 address configured for $vpp_eth_name!" usage fi - vpp_args="$vpp_args plugins { path ${lib64_dir}vpp_plugins } dpdk { dev $vpp_eth_pci_id }" + vpp_args="$vpp_args plugins { path ${lib_dir}vpp_plugins } dpdk { dev $vpp_eth_pci_id }" sudo ifconfig $vpp_eth_name down 2> /dev/null echo "Configuring VPP to use $vpp_eth_name ($vpp_eth_pci_id), inet addr $vpp_eth_ip4_addr" @@ -724,7 +724,7 @@ native_preload() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 3" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd2_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd2_file echo "${pre_cmd}${app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file @@ -740,7 +740,7 @@ native_preload() { namespace_secret="$client_namespace_secret" fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 4" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd3_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd3_file echo "srvr_addr=\"$sock_srvr_addr\"" >> $cmd3_file echo "${pre_cmd}${app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client @@ -779,7 +779,7 @@ native_vcl() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "$delay" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd2_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$LD_LIBRARY_PATH\"" >> $cmd2_file echo "${pre_cmd}${app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file @@ -800,7 +800,7 @@ native_vcl() { namespace_secret="$client_namespace_secret" fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "$delay" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd3_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$LD_LIBRARY_PATH\"" >> $cmd3_file echo "srvr_addr=\"$sock_srvr_addr\"" >> $cmd3_file echo "${pre_cmd}${app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client @@ -867,7 +867,7 @@ docker_preload() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2" - echo "docker run -it -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir:$docker_ld_preload_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file + echo "docker run -it -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir:$docker_ld_preload_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file fi @@ -883,7 +883,7 @@ docker_preload() { fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 4" echo "$get_docker_server_ip4addr" >> $cmd3_file - echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file + echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client chmod +x $cmd3_file fi @@ -916,7 +916,7 @@ docker_vcl() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2" - echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file + echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir $docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file fi @@ -932,7 +932,7 @@ docker_vcl() { fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 3" echo "$get_docker_server_ip4addr" >> $cmd3_file - echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file + echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir $docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client chmod +x $cmd3_file fi -- cgit 1.2.3-korg