Increase timeout for X starting.

tools/xdisplaycheck/xdisplaycheck.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This is a small program that tries to connect to the X server.  It
 // continually retries until it connects or 5 seconds pass.  If it fails

[Peter Mayo, 2012/04/13 02:01:05]

Should update the timeout in these comments too

[M-A Ruel, 2012/04/13 18:56:40]

You are self-reviewing your CL? :)

 // to connect to the X server after 5 seconds, it returns an error code
 // of -1.
 //
 // This is to help verify that the X server is available before we start
 // start running tests on the build bots.
 
 #include <errno.h>
 #include <stdio.h>
 #include <time.h>
 #include <X11/Xlib.h>
@@ skipping 10 matching lines @@
   duration_ms -= sleep_time.tv_sec * 1000;
 
   // Contains the portion of duration_ms < 1 sec.
   sleep_time.tv_nsec = duration_ms * 1000 * 1000;  // nanoseconds.
 
   while (nanosleep(&sleep_time, &remaining) == -1 && errno == EINTR)
     sleep_time = remaining;
 }
 
 int main(int argc, char* argv[]) {
-  int kNumTries = 50;
+  int kNumTries = 50;  // 49*48/2 * 10 = 12.25s of waiting
   Display* display = NULL;
-  for (int i = 0; i < kNumTries; ++i) {
+  int tries;
+  for (tries = 0; tries < kNumTries; ++tries) {
     display = XOpenDisplay(NULL);
     if (display)
       break;
-    Sleep(100);
+    Sleep(10 * tries);
   }
 
   if (!display) {
     fprintf(stderr, "Failed to connect to %s\n", XDisplayName(NULL));
     return -1;
   }
 
+  fprintf(stderr, "Connected after %d retries\n", tries);
+
 #if defined(USE_AURA)
   // Check for XInput2
   int opcode, event, err;
   if (!XQueryExtension(display, "XInputExtension", &opcode, &event, &err)) {
     fprintf(stderr,
         "Failed to get XInputExtension on %s.\n", XDisplayName(NULL));
     return -1;
   }
 
   int major = 2, minor = 0;
   if (XIQueryVersion(display, &major, &minor) == BadRequest) {
     fprintf(stderr,
         "Server does not have XInput2 on %s.\n", XDisplayName(NULL));
     return -1;
   }
 
   // Ask for the list of devices. This can cause some Xvfb to crash.
   int count = 0;
   XIDeviceInfo* devices = XIQueryDevice(display, XIAllDevices, &count);
   if (devices)
     XIFreeDeviceInfo(devices);
+
+  fprintf(stderr,
+      "XInput2 verified initially sane on %s.\n", XDisplayName(NULL));
 #endif
 
   return 0;
 }