Title: [227193] trunk/Tools
- Revision
- 227193
- Author
- [email protected]
- Date
- 2018-01-19 01:58:04 -0800 (Fri, 19 Jan 2018)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (227192 => 227193)
--- trunk/Tools/ChangeLog 2018-01-19 07:31:26 UTC (rev 227192)
+++ trunk/Tools/ChangeLog 2018-01-19 09:58:04 UTC (rev 227193)
@@ -1,3 +1,14 @@
+2018-01-19 Carlos Garcia Campos <[email protected]>
+
+ [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-18 Carlos Garcia Campos <[email protected]>
[GTK] Run WebDriver tests in the bots
Modified: trunk/Tools/Scripts/run-webdriver-tests (227192 => 227193)
--- trunk/Tools/Scripts/run-webdriver-tests 2018-01-19 07:31:26 UTC (rev 227192)
+++ trunk/Tools/Scripts/run-webdriver-tests 2018-01-19 09:58:04 UTC (rev 227193)
@@ -63,6 +63,17 @@
_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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
