Merge r227193 - [GTK] WebDriver tests are running outside the jhbuild…

… env

https://bugs.webkit.org/show_bug.cgi?id=181842

Reviewed by Žan Doberšek.

We need to enter jhbuild env in run-webdriver-tests.

* Scripts/run-webdriver-tests:

Tools/ChangeLog

@@ -1,3 +1,14 @@
+2018-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebDriver tests are running outside the jhbuild env
+        https://bugs.webkit.org/show_bug.cgi?id=181842
+
+        Reviewed by Žan Doberšek.
+
+        We need to enter jhbuild env in run-webdriver-tests.
+
+        * Scripts/run-webdriver-tests:
+
 2018-01-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: ignore the driver in selenium test names when getting expectations

Tools/Scripts/run-webdriver-tests

@@ -63,6 +63,17 @@ except NotImplementedError, e:
     _log.error(str(e))
     sys.exit(-1)
 
+if port.name() in ['gtk', 'wpe']:
+    import os
+    top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
+    sys.path.insert(0, os.path.join(top_level_directory, 'Tools', 'jhbuild'))
+    import jhbuildutils
+
+    if not jhbuildutils.enter_jhbuild_environment_if_available(port.name()):
+        print '***'
+        print '*** Warning: jhbuild environment not present. Run update-webkitgtk-libs before build-webkit to ensure proper testing.'
+        print '***'
+
 port._display_server = options.display_server
 runner = WebDriverTestRunner(port)
 runner.run(args)