[PATCH xorg-integration-tests] Remove WaitForConnections()

Daniel Martin consume.noise at gmail.com
Mon Oct 1 16:24:41 PDT 2012


WaitForConnections() was removed from xorg-gtest and superseded with a
mechanism which gets notified by the XServer via SIGUSR1 when it's ready
for connections.
---
 tests/common/helpers.cpp           | 1 -
 tests/common/input-driver-test.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tests/common/helpers.cpp b/tests/common/helpers.cpp
index 51ffa2b..4563cad 100644
--- a/tests/common/helpers.cpp
+++ b/tests/common/helpers.cpp
@@ -18,7 +18,6 @@ void StartServer(std::string prefix, ::xorg::testing::XServer &server, XOrgConfi
     server.SetOption("-logfile", logfile.str());
     server.SetDisplayNumber(133);
     server.Start();
-    server.WaitForConnections();
 }
 
 int FindInputDeviceByName(Display *dpy, const std::string &device_name, int *deviceid)
diff --git a/tests/common/input-driver-test.cpp b/tests/common/input-driver-test.cpp
index 60cc5b6..d0750c7 100644
--- a/tests/common/input-driver-test.cpp
+++ b/tests/common/input-driver-test.cpp
@@ -31,7 +31,6 @@ int InputDriverTest::RegisterXI2(int major, int minor)
 
 void InputDriverTest::StartServer() {
     server.Start();
-    server.WaitForConnections();
     xorg::testing::Test::SetDisplayString(server.GetDisplayString());
 
     ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp());
-- 
1.7.12.2



More information about the xorg-devel mailing list