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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@193741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bda8970..a3b5e89 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+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>
 
         [GTK] Notify WebCore when notification is clicked
 2015-12-07  Gustavo Noronha Silva  <gns@gnome.org>
 
         [GTK] Notify WebCore when notification is clicked

diff --git a/Tools/jhbuild/jhbuildutils.py b/Tools/jhbuild/jhbuildutils.py
index 4fdc888..c00160e 100644 (file)
--- a/Tools/jhbuild/jhbuildutils.py
+++ b/Tools/jhbuild/jhbuildutils.py
@@ -34,8 +34,10 @@ def enter_jhbuild_environment_if_available(platform):
     source_path = os.path.join(get_dependencies_path(platform), "Source", "jhbuild")
     sys.path.insert(0, source_path)
 
     source_path = os.path.join(get_dependencies_path(platform), "Source", "jhbuild")
     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__['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.
     site_packages_path = glob.glob(os.path.join(get_dependencies_path(platform), "Root", "lib", "*", "site-packages"))
 
     # We don't know the Python version, so we just assume that we can safely take the first one in the list.
     site_packages_path = glob.glob(os.path.join(get_dependencies_path(platform), "Root", "lib", "*", "site-packages"))