Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VCL: close-on-empty state transition refactoring.
[vpp.git]
/
test
/
scripts
/
socket_test.sh
diff --git
a/test/scripts/socket_test.sh
b/test/scripts/socket_test.sh
index
64a1301
..
0b1f928
100755
(executable)
--- a/
test/scripts/socket_test.sh
+++ b/
test/scripts/socket_test.sh
@@
-248,12
+248,6
@@
done
VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib64_dir}"
VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib64_dir}"
-if [ -n "$multi_host" ] ; then
- VCL_SESSION_SCOPE_GLOBAL=true
-else
- VCL_SESSION_SCOPE_LOCAL=true
-fi
-
if [ -z "$WS_ROOT" ] ; then
echo "ERROR: WS_ROOT environment variable not set!" >&2
echo " Please set WS_ROOT to VPP workspace root directory." >&2
if [ -z "$WS_ROOT" ] ; then
echo "ERROR: WS_ROOT environment variable not set!" >&2
echo " Please set WS_ROOT to VPP workspace root directory." >&2
@@
-349,7
+343,7
@@
fi
if [ -z "$api_segment" ] ; then
api_segment=" api-segment { gid $user_gid }"
fi
if [ -z "$api_segment" ] ; then
api_segment=" api-segment { gid $user_gid }"
fi
-vpp_args="unix { interactive exec $tmp_vpp_exec_file}${api_segment}"
+vpp_args="unix { interactive
full-coredump coredump-size unlimited
exec $tmp_vpp_exec_file}${api_segment}"
if [ $iperf3 -eq 1 ] ; then
app_dir="$(dirname $(which iperf3))/"
if [ $iperf3 -eq 1 ] ; then
app_dir="$(dirname $(which iperf3))/"
@@
-491,7
+485,7
@@
set_pre_cmd() {
pre_cmd="$gdb_in_emacs "
elif [ $gdb -eq 1 ] ; then
write_gdb_cmdfile $tmp_gdb_cmdfile $gdb_cmdfile $emacs $3
pre_cmd="$gdb_in_emacs "
elif [ $gdb -eq 1 ] ; then
write_gdb_cmdfile $tmp_gdb_cmdfile $gdb_cmdfile $emacs $3
- pre_cmd="gdb -x $tmp_gdb_cmdfile -
i=mi -
-args "
+ pre_cmd="gdb -x $tmp_gdb_cmdfile --args "
elif [ -z $3 ] ; then
unset -v pre_cmd
else
elif [ -z $3 ] ; then
unset -v pre_cmd
else
@@
-515,15
+509,20
@@
write_script_header() {
echo "trap \"rm -f $1 $2 $tmp_vpp_exec_file\" $trap_signals" >> $1
fi
fi
echo "trap \"rm -f $1 $2 $tmp_vpp_exec_file\" $trap_signals" >> $1
fi
fi
- echo "export VCL_CONFIG=${vcl_config_dir}${vcl_config}" >> $1
+ if [ -n "$VCL_CONFIG" ] ; then
+ echo "export VCL_CONFIG=${vcl_config_dir}${vcl_config}" >> $1
+ fi
+ if [ -n "$VCL_DEBUG" ] ; then
+ echo "export VCL_DEBUG=$VCL_DEBUG" >> $1
+ fi
if [ -n "$namespace_id" ] ; then
echo "export VCL_APP_NAMESPACE_ID=\"$namespace_id\"" >> $1
echo "export VCL_APP_NAMESPACE_SECRET=\"$namespace_secret\"" >> $1
fi
if [ -n "$namespace_id" ] ; then
echo "export VCL_APP_NAMESPACE_ID=\"$namespace_id\"" >> $1
echo "export VCL_APP_NAMESPACE_SECRET=\"$namespace_secret\"" >> $1
fi
- if [ -n "$VCL_APP_SCOPE_LOCAL" ] ; then
+ if [ -n "$VCL_APP_SCOPE_LOCAL" ]
|| [ -z "$multi_host" ]
; then
echo "export VCL_APP_SCOPE_LOCAL=true" >> $1
fi
echo "export VCL_APP_SCOPE_LOCAL=true" >> $1
fi
- if [ -n "$VCL_APP_SCOPE_GLOBAL" ] ; then
+ if [ -n "$VCL_APP_SCOPE_GLOBAL" ]
|| [ -n "$multi_host" ]
; then
echo "export VCL_APP_SCOPE_GLOBAL=true" >> $1
fi
if [ -n "$VCL_APP_PROXY_TRANSPORT_TCP" ] ; then
echo "export VCL_APP_SCOPE_GLOBAL=true" >> $1
fi
if [ -n "$VCL_APP_PROXY_TRANSPORT_TCP" ] ; then
@@
-575,7
+574,7
@@
write_gdb_cmdfile() {
echo "set confirm off" >> $1
if [ -n "$4" ] ; then
echo "set exec-wrapper env LD_PRELOAD=$4" >> $1
echo "set confirm off" >> $1
if [ -n "$4" ] ; then
echo "set exec-wrapper env LD_PRELOAD=$4" >> $1
- echo "start" >> $1
+
#
echo "start" >> $1
fi
if [ ! -f $2 ] ; then
fi
if [ ! -f $2 ] ; then