Changeset 193741 in webkit

Timestamp:

Dec 8, 2015, 1:12:29 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix GTK+ API tests after r193639.

The new jhbuild version needs some more variables ot be present in
the builtin dict, even if they are set to None.

• jhbuild/jhbuildutils.py:

(enter_jhbuild_environment_if_available):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• jhbuild/jhbuildutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-12-08  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK+ API tests after r193639.
+
+        The new jhbuild version needs some more variables ot be present in
+        the builtin dict, even if they are set to None.
+
+        * jhbuild/jhbuildutils.py:
+        (enter_jhbuild_environment_if_available):
+
 2015-12-07  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/jhbuild/jhbuildutils.py

@@ -35 +35 @@
     sys.path.insert(0, source_path)
 
-    # When loading jhbuild from the source checkout it fails if the SRCDIR variable is not set.
+    # When loading jhbuild from the source checkout it fails if the SRCDIR, PKGDATADIR or DATADIR aren't present.
     __builtin__.__dict__['SRCDIR'] = source_path
+    __builtin__.__dict__['PKGDATADIR'] = None
+    __builtin__.__dict__['DATADIR'] = None
 
     # We don't know the Python version, so we just assume that we can safely take the first one in the list.