summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-10-23 14:09:44 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-10-29 08:53:42 +1000
commit4a8bee6bcb7d4c870b703d13b6dde91ae26bd389 (patch)
tree937df36bd73af840a011bf4bf2b5cbaa0da05a48
parentd27784bc29804b7830e890c6745123fd5703a5cb (diff)
xserver: increase timout to 3 seconds
A server without a config file that inits all input devices takes just over a second on my machine. Up this timeout so we don't get spurious signals later. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
-rw-r--r--src/xserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xserver.cpp b/src/xserver.cpp
index 55efab1..156c820 100644
--- a/src/xserver.cpp
+++ b/src/xserver.cpp
@@ -419,7 +419,7 @@ void xorg::testing::XServer::Start(const std::string &program) {
std::string err_msg;
sigset_t sig_mask;
- struct timespec sig_timeout = {1, 0}; /* 1 sec + 0 nsec */
+ struct timespec sig_timeout = {3, 0}; /* 3 sec + 0 nsec */
/* add SIGUSR1 to the signal mask */
sigemptyset(&sig_mask);