Title: [150677] trunk/Tools
- Revision
- 150677
- Author
- [email protected]
- Date
- 2013-05-24 18:18:56 -0700 (Fri, 24 May 2013)
Log Message
Unreviewed build fix. Don't use new NRWT logic needed
by Windows yet. Activate (and fix test) when we cut over.
* Scripts/webkitpy/port/driver.py:
(Driver._setup_environ_for_driver):
(Driver._start):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (150676 => 150677)
--- trunk/Tools/ChangeLog 2013-05-25 01:12:22 UTC (rev 150676)
+++ trunk/Tools/ChangeLog 2013-05-25 01:18:56 UTC (rev 150677)
@@ -1,5 +1,14 @@
2013-05-24 Brent Fulgham <[email protected]>
+ Unreviewed build fix. Don't use new NRWT logic needed
+ by Windows yet. Activate (and fix test) when we cut over.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._setup_environ_for_driver):
+ (Driver._start):
+
+2013-05-24 Brent Fulgham <[email protected]>
+
[Windows] Expose database storage and cache locations via preferences.
https://bugs.webkit.org/show_bug.cgi?id=116729
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (150676 => 150677)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2013-05-25 01:12:22 UTC (rev 150676)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2013-05-25 01:18:56 UTC (rev 150677)
@@ -284,7 +284,10 @@
environment['DYLD_LIBRARY_PATH'] = self._port._build_path()
environment['DYLD_FRAMEWORK_PATH'] = self._port._build_path()
# FIXME: We're assuming that WebKitTestRunner checks this DumpRenderTree-named environment variable.
- environment['DUMPRENDERTREE_TEMP'] = str(self._port._driver_tempdir_for_environment())
+ # FIXME: Commented out for now to avoid tests breaking. Re-enable after
+ # we cut over to NRWT
+ #environment['DUMPRENDERTREE_TEMP'] = str(self._port._driver_tempdir_for_environment())
+ environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
if 'WEBKITOUTPUTDIR' in os.environ:
environment['WEBKITOUTPUTDIR'] = os.environ['WEBKITOUTPUTDIR']
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
