jhbuild r2492 - in trunk: . jhbuild/modtypes

[fpeters svn gnome org]

Author: fpeters
Date: Sun Nov  9 23:05:35 2008
New Revision: 2492
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2492&view=rev

Log:
* jhbuild/modtypes/testmodule.py: do not try to force a X display when
running dogtail scripts and noxvfb is set.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/modtypes/testmodule.py

Modified: trunk/jhbuild/modtypes/testmodule.py
==============================================================================
--- trunk/jhbuild/modtypes/testmodule.py	(original)
+++ trunk/jhbuild/modtypes/testmodule.py	Sun Nov  9 23:05:35 2008
@@ -329,10 +329,15 @@
                 test_cases.append(file)
 
         status = ''
+        if buildscript.config.noxvfb:
+            extra_env = {}
+        else:
+            extra_env = {'DISPLAY': ':%s' % self.screennum}
+
         for test_case in test_cases:
             try:
                 buildscript.execute('python %s' % test_case,
-                        cwd=src_dir, extra_env={'DISPLAY': ':%s' % self.screennum})
+                        cwd=src_dir, extra_env=extra_env)
             except CommandError, e:
                 if e.returncode != 0:
                     raise BuildStateError('%s failed' % test_case)