My box here takes just under 1200 ms to terminate a full server, which is just over the current default timeout of 1000, causing the examples to fail.
Signed-off-by: Peter Hutterer <[email protected]> --- include/xorg/gtest/xorg-gtest-xserver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/xorg/gtest/xorg-gtest-xserver.h b/include/xorg/gtest/xorg-gtest-xserver.h index 4802003..efe46e1 100644 --- a/include/xorg/gtest/xorg-gtest-xserver.h +++ b/include/xorg/gtest/xorg-gtest-xserver.h @@ -101,7 +101,7 @@ class XServer : public xorg::testing::Process { * @returns true if termination succeeded and, if a timout is given, the * process shut down within that timeout. false otherwise. */ - virtual bool Terminate(unsigned int timeout = 1000); + virtual bool Terminate(unsigned int timeout = 2000); /** * Kills the server. With a vengeance. @@ -113,7 +113,7 @@ class XServer : public xorg::testing::Process { * @returns true if kill succeeded and, if a timout is given, the * process shut down within that timeout. false otherwise. */ - virtual bool Kill(unsigned int timeout = 1000); + virtual bool Kill(unsigned int timeout = 2000); /** * Remove the log file used by this server. By default, this function -- 1.8.0.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
