diff options
| -rwxr-xr-x | vespabase/src/common-env.sh | 2 | ||||
| -rw-r--r-- | vespalib/src/tests/net/socket/socket_test.cpp | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index b970c5bed60..ad77965fef6 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -23,7 +23,7 @@ consider_fallback () { : $1 already has value $oldvariablevalue elif [ -z "${2}" ]; then : proposed value "${2}" is empty - elif [ `expr match "$2" ".*'"` != 0 ]; then + elif [ `expr "$2" : ".*'"` != 0 ]; then : proposed value "${2}" contains a single-quote else eval "${1}='${2}'" diff --git a/vespalib/src/tests/net/socket/socket_test.cpp b/vespalib/src/tests/net/socket/socket_test.cpp index 88146cd4fb2..08893c9273b 100644 --- a/vespalib/src/tests/net/socket/socket_test.cpp +++ b/vespalib/src/tests/net/socket/socket_test.cpp @@ -204,14 +204,6 @@ TEST_MT_FF("require that basic unix domain socket io works (path)", 2, TEST_DO(verify_socket_io(is_server, socket)); } -TEST_MT_FF("require that basic unix domain socket io works (name)", 2, - ServerSocket(make_string("ipc/name:my_socket-%d", int(getpid()))), TimeBomb(60)) -{ - bool is_server = (thread_id == 0); - SocketHandle socket = connect_sockets(is_server, f1); - TEST_DO(verify_socket_io(is_server, socket)); -} - TEST_MT_FF("require that server accept can be interrupted", 2, ServerSocket("tcp/0"), TimeBomb(60)) { bool is_server = (thread_id == 0); if (is_server) { @@ -279,6 +271,15 @@ TEST("require that a server socket will remove an old socket file if it cannot b EXPECT_TRUE(!is_socket("my_socket")); } +#ifdef __linux__ +TEST_MT_FF("require that basic unix domain socket io works (name)", 2, + ServerSocket(make_string("ipc/name:my_socket-%d", int(getpid()))), TimeBomb(60)) +{ + bool is_server = (thread_id == 0); + SocketHandle socket = connect_sockets(is_server, f1); + TEST_DO(verify_socket_io(is_server, socket)); +} + TEST("require that two server sockets cannot have the same abstract unix domain socket name") { vespalib::string spec = make_string("ipc/name:my_socket-%d", int(getpid())); ServerSocket server1(spec); @@ -313,6 +314,7 @@ TEST_MT_FFF("require that abstract and file-based unix domain sockets are not in SocketHandle socket = connect_sockets(is_server, server_socket); TEST_DO(verify_socket_io(is_server, socket)); } +#endif TEST("require that sockets can be set blocking and non-blocking") { SocketHandle handle(socket(my_inet(), SOCK_STREAM, 0)); |