summaryrefslogtreecommitdiffstats
path: root/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-04-19 10:13:22 +0000
committerPavel Labath <labath@google.com>2017-04-19 10:13:22 +0000
commit107e694271b5b2679136de194f461c1b6c33463f (patch)
treeb39334f192851936561e48467cf20fd3ee9bcfe7 /lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
parent742aed86833d23ad559c6437a0fc7ab47f3bbdf8 (diff)
downloadbcm5719-llvm-107e694271b5b2679136de194f461c1b6c33463f.tar.gz
bcm5719-llvm-107e694271b5b2679136de194f461c1b6c33463f.zip
Revert yesterdays IPv6 patches
The break the linux bots (and probably any other machine which would run the test suite in a massively parallel way). The problem is that it can happen that we only successfully create an IPv6 listening socket (because the relevant IPv4 port is used by another process) and then the connecting side attempts to connect to the IPv4 port and fails. It's not very obvious how to fix this problem, so I am reverting this until we come up with a solution. llvm-svn: 300669
Diffstat (limited to 'lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp')
-rw-r--r--lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
index 6440e814efd..08501f50f65 100644
--- a/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
+++ b/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.cpp
@@ -33,14 +33,15 @@ void GDBRemoteTest::TearDownTestCase() {
void Connect(GDBRemoteCommunication &client, GDBRemoteCommunication &server) {
bool child_processes_inherit = false;
Error error;
- TCPSocket listen_socket(true, child_processes_inherit);
+ TCPSocket listen_socket(child_processes_inherit, error);
ASSERT_FALSE(error.Fail());
error = listen_socket.Listen("127.0.0.1:0", 5);
ASSERT_FALSE(error.Fail());
Socket *accept_socket;
std::future<Error> accept_error = std::async(std::launch::async, [&] {
- return listen_socket.Accept(accept_socket);
+ return listen_socket.Accept("127.0.0.1:0", child_processes_inherit,
+ accept_socket);
});
char connect_remote_address[64];
OpenPOWER on IntegriCloud