From 460d8861459e453b4111aeb632cf33976f584702 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Mon, 27 Oct 2008 09:40:34 +0000
Subject: Switch to Xvnc to work around Xvfb crash on x86_64.

---
(limited to 'scripts')

diff --git a/scripts/check.py b/scripts/check.py
index 3213f87..fbdac23 100644
--- a/scripts/check.py
+++ b/scripts/check.py
@@ -74,13 +74,13 @@ class cmd_check(Command):
                         help='specify the check type')
             ])
 
-    def start_xvfb(self):
+    def start_virtual_x(self):
         result = None
 
         for port in range(100, 1000):
             if not check_display(port):
                 try:
-                    p = subprocess.Popen(['Xvfb', '-ac', ':%d' % port],
+                    p = subprocess.Popen(['Xvnc', '-ac', ':%d' % port],
                                          stdout=open(os.devnull, "w"),
                                          stderr=subprocess.STDOUT)
 
@@ -95,22 +95,22 @@ class cmd_check(Command):
                 except OSError:
                     break
 
-        print 'Cannot execute xfvb, will use the default display.'
+        print 'Cannot execute virtual X, will use the default display.'
         return None
 
     def lint(self, module):
-        xvfb_pid = self.start_xvfb()
+        vx_pid = self.start_virtual_x()
         try:
             subprocess.call(['pylint', module, '--rcfile=%s' % pylintrc_path])
         finally:
-            os.kill(xvfb_pid, signal.SIGTERM)
+            os.kill(vx_pid, signal.SIGTERM)
 
     def check_ui(self, config):
-        xvfb_pid = self.start_xvfb()
+        vx_pid = self.start_virtual_x()
         try:
             result = UICheck().start()
         finally:
-            os.kill(xvfb_pid, signal.SIGTERM)
+            os.kill(vx_pid, signal.SIGTERM)
 
         return result
 
--
cgit v0.9.1