Title: [137189] trunk/Tools
- Revision
- 137189
- Author
- [email protected]
- Date
- 2012-12-10 11:29:54 -0800 (Mon, 10 Dec 2012)
Log Message
run_webkit_tests throws exception when DRT is not present
https://bugs.webkit.org/show_bug.cgi?id=104565
Reviewed by Jochen Eisinger.
Don't actually try to print the bot results if there aren't
any because we exited before running any tests.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(main):
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(MainTest.test_build_check):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137188 => 137189)
--- trunk/Tools/ChangeLog 2012-12-10 19:26:30 UTC (rev 137188)
+++ trunk/Tools/ChangeLog 2012-12-10 19:29:54 UTC (rev 137189)
@@ -1,3 +1,18 @@
+2012-12-10 Dirk Pranke <[email protected]>
+
+ run_webkit_tests throws exception when DRT is not present
+ https://bugs.webkit.org/show_bug.cgi?id=104565
+
+ Reviewed by Jochen Eisinger.
+
+ Don't actually try to print the bot results if there aren't
+ any because we exited before running any tests.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (main):
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (MainTest.test_build_check):
+
2012-12-10 Benjamin Poulain <[email protected]>
Add convenience methods to use ListHashSet for a LRU cache
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (137188 => 137189)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-12-10 19:26:30 UTC (rev 137188)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-12-10 19:29:54 UTC (rev 137189)
@@ -429,10 +429,10 @@
try:
run_details = run(port, options, args, stderr)
+ if run_details.exit_code != -1:
+ bot_printer = buildbot_results.BuildBotPrinter(stdout, options.debug_rwt_logging)
+ bot_printer.print_results(run_details)
- bot_printer = buildbot_results.BuildBotPrinter(stdout, options.debug_rwt_logging)
- bot_printer.print_results(run_details)
-
return run_details.exit_code
except Exception, e:
print >> stderr, '\n%s raised: %s' % (e.__class__.__name__, str(e))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (137188 => 137189)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-12-10 19:26:30 UTC (rev 137188)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-12-10 19:29:54 UTC (rev 137189)
@@ -879,6 +879,16 @@
self.assertEqual(stdout.getvalue(), '')
self.assertTrue('unsupported platform' in stderr.getvalue())
+ def test_build_check(self):
+ # By using a port_name for a different platform than the one we're running on, the build check should always fail.
+ if sys.platform == 'darwin':
+ port_name = 'chromium-linux'
+ else:
+ port_name = 'chromium-mac'
+ out = StringIO.StringIO()
+ err = StringIO.StringIO()
+ self.assertEqual(run_webkit_tests.main(['--platform', port_name, 'fast/harness/results.html'], out, err), -1)
+
def test_verbose_in_child_processes(self):
# When we actually run multiple processes, we may have to reconfigure logging in the
# child process (e.g., on win32) and we need to make sure that works and we still
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
