Title: [124366] trunk/Tools
- Revision
- 124366
- Author
- [email protected]
- Date
- 2012-08-01 14:02:56 -0700 (Wed, 01 Aug 2012)
Log Message
run-perf-tests --build-directory doesn't work
https://bugs.webkit.org/show_bug.cgi?id=92051
Reviewed by Dirk Pranke.
The bug was caused by not prepending build_directory even when one is defined.
Fixed that.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port._build_path):
* Scripts/webkitpy/layout_tests/port/base_unittest.py:
(PortTest.test_build_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124365 => 124366)
--- trunk/Tools/ChangeLog 2012-08-01 20:49:26 UTC (rev 124365)
+++ trunk/Tools/ChangeLog 2012-08-01 21:02:56 UTC (rev 124366)
@@ -1,3 +1,18 @@
+2012-08-01 Ryosuke Niwa <[email protected]>
+
+ run-perf-tests --build-directory doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=92051
+
+ Reviewed by Dirk Pranke.
+
+ The bug was caused by not prepending build_directory even when one is defined.
+ Fixed that.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port._build_path):
+ * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+ (PortTest.test_build_path):
+
2012-08-01 Sheriff Bot <[email protected]>
Unreviewed, rolling out r123865.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (124365 => 124366)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-01 20:49:26 UTC (rev 124365)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-08-01 21:02:56 UTC (rev 124366)
@@ -1151,7 +1151,7 @@
if not root_directory:
build_directory = self.get_option('build_directory')
if build_directory:
- root_directory = self._filesystem.join(self.get_option('configuration'))
+ root_directory = self._filesystem.join(build_directory, self.get_option('configuration'))
else:
root_directory = self._config.build_directory(self.get_option('configuration'))
# Set --root so that we can pass this to subprocesses and avoid making the
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py (124365 => 124366)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2012-08-01 20:49:26 UTC (rev 124365)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2012-08-01 21:02:56 UTC (rev 124366)
@@ -437,6 +437,10 @@
self.assertFalse('passes/text.html' in tests)
self.assertTrue('virtual/passes/text.html' in tests)
+ def test_build_path(self):
+ port = self.make_port(options=optparse.Values({'build_directory': '/my-build-directory/'}))
+ self.assertEqual(port._build_path(), '/my-build-directory/Release')
+
if __name__ == '__main__':
unittest.main()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
