X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fscripts%2Fsocket_test.sh;h=03164a96250416370318da11b72342c14b070020;hb=e695cb4dbdb6f9424ac5a567799e67f791fad328;hp=64a13015ae00a4c37dd1f448d8d09a47d86e2765;hpb=6c36f53ff0419d27f3e5720a42e0b43d5e7157f0;p=vpp.git diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh index 64a13015ae0..03164a96250 100755 --- 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}" -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 @@ -520,10 +514,10 @@ write_script_header() { 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 - 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