Title: [177147] trunk/Tools
- Revision
- 177147
- Author
- clo...@igalia.com
- Date
- 2014-12-11 09:02:46 -0800 (Thu, 11 Dec 2014)
Log Message
[GTK] REGRESSION(r175555) GTK API Tests run outside the JHBuild.
https://bugs.webkit.org/show_bug.cgi?id=139537
Reviewed by Carlos Garcia Campos.
* jhbuild/jhbuild-wrapper: Pass the port name in the invocation
of get_dependencies_path().
* jhbuild/jhbuildutils.py:
(get_dependencies_path): Fix the function to return the new
dependencies path: DependenciesPORT.
(enter_jhbuild_environment_if_available): Pass the port name
when invoking get_dependencies_path().
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (177146 => 177147)
--- trunk/Tools/ChangeLog 2014-12-11 16:41:33 UTC (rev 177146)
+++ trunk/Tools/ChangeLog 2014-12-11 17:02:46 UTC (rev 177147)
@@ -1,3 +1,18 @@
+2014-12-11 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ [GTK] REGRESSION(r175555) GTK API Tests run outside the JHBuild.
+ https://bugs.webkit.org/show_bug.cgi?id=139537
+
+ Reviewed by Carlos Garcia Campos.
+
+ * jhbuild/jhbuild-wrapper: Pass the port name in the invocation
+ of get_dependencies_path().
+ * jhbuild/jhbuildutils.py:
+ (get_dependencies_path): Fix the function to return the new
+ dependencies path: DependenciesPORT.
+ (enter_jhbuild_environment_if_available): Pass the port name
+ when invoking get_dependencies_path().
+
2014-12-10 Lucas Forschler <lforsch...@apple.com>
Update Apple owned build slaves.
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (177146 => 177147)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2014-12-11 16:41:33 UTC (rev 177146)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2014-12-11 17:02:46 UTC (rev 177147)
@@ -38,9 +38,9 @@
except ValueError as e:
sys.exit(e)
-dependencies_path = jhbuildutils.get_dependencies_path()
-installation_prefix = os.path.abspath(os.path.join(dependencies_path + platform.upper(), 'Root'))
-source_path = os.path.abspath(os.path.join(dependencies_path + platform.upper(), 'Source'))
+dependencies_path = jhbuildutils.get_dependencies_path(platform)
+installation_prefix = os.path.abspath(os.path.join(dependencies_path, 'Root'))
+source_path = os.path.abspath(os.path.join(dependencies_path, 'Source'))
jhbuild_source_path = os.path.join(source_path, 'jhbuild')
jhbuild_path = os.path.join(installation_prefix, 'bin', 'jhbuild')
Modified: trunk/Tools/jhbuild/jhbuildutils.py (177146 => 177147)
--- trunk/Tools/jhbuild/jhbuildutils.py 2014-12-11 16:41:33 UTC (rev 177146)
+++ trunk/Tools/jhbuild/jhbuildutils.py 2014-12-11 17:02:46 UTC (rev 177147)
@@ -13,11 +13,12 @@
return os.path.join(*(top_level_dir,) + args)
-def get_dependencies_path():
+def get_dependencies_path(platform):
+ dependencies_dir = "%s%s" % ('Dependencies', platform.upper())
if 'WEBKIT_OUTPUTDIR' in os.environ:
- return os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies'))
+ return os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], dependencies_dir))
else:
- return os.path.abspath(top_level_path('WebKitBuild', 'Dependencies'))
+ return os.path.abspath(top_level_path('WebKitBuild', dependencies_dir))
def get_config_file_for_platform(platform):
@@ -25,19 +26,19 @@
def enter_jhbuild_environment_if_available(platform):
- if not os.path.exists(get_dependencies_path()):
+ if not os.path.exists(get_dependencies_path(platform)):
return False
# Sometimes jhbuild chooses to install in a way that reads the library from the source directory, so fall
# back to that method.
- source_path = os.path.join(get_dependencies_path(), "Source", "jhbuild")
+ 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.
__builtin__.__dict__['SRCDIR'] = source_path
# 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(), "Root", "lib", "*", "site-packages"))
+ site_packages_path = glob.glob(os.path.join(get_dependencies_path(platform), "Root", "lib", "*", "site-packages"))
if len(site_packages_path):
site_packages_path = site_packages_path[0]
sys.path.insert(0, site_packages_path)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
