Title: [193741] trunk/Tools
- Revision
- 193741
- Author
- [email protected]
- Date
- 2015-12-08 01:12:29 -0800 (Tue, 08 Dec 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (193740 => 193741)
--- trunk/Tools/ChangeLog 2015-12-08 08:55:46 UTC (rev 193740)
+++ trunk/Tools/ChangeLog 2015-12-08 09:12:29 UTC (rev 193741)
@@ -1,3 +1,13 @@
+2015-12-08 Carlos Garcia Campos <[email protected]>
+
+ 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 <[email protected]>
[GTK] Notify WebCore when notification is clicked
Modified: trunk/Tools/jhbuild/jhbuildutils.py (193740 => 193741)
--- trunk/Tools/jhbuild/jhbuildutils.py 2015-12-08 08:55:46 UTC (rev 193740)
+++ trunk/Tools/jhbuild/jhbuildutils.py 2015-12-08 09:12:29 UTC (rev 193741)
@@ -34,8 +34,10 @@
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__['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"))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
