diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2017-11-02 22:04:42 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2017-11-06 00:58:20 +0000 |
| commit | e695cb4dbdb6f9424ac5a567799e67f791fad328 (patch) | |
| tree | d586fe252d4613f792f0618c9cb8e0d0f394846d /test/scripts | |
| parent | 6c36f53ff0419d27f3e5720a42e0b43d5e7157f0 (diff) | |
VCL_LDPRELOAD: mixed libc/vcl epoll fd's
Change-Id: Ibc82781ddef5ea0517220b9054db3d53ec348c6c
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/scripts')
| -rwxr-xr-x | test/scripts/socket_test.sh | 10 |
1 files changed, 2 insertions, 8 deletions
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 |