Title: [136474] trunk/Tools
- Revision
- 136474
- Author
- [email protected]
- Date
- 2012-12-03 22:59:22 -0800 (Mon, 03 Dec 2012)
Log Message
Unreviewed, functionality fix after r136437.
Calling sys.exit actually raises a SystemExit exception that
is then handled in the second block and causes the script to
return an 'exceptional' exit code rather than the code presenting
the number of failed tests.
This is just a temporary fix to get the faultless bots green while
they are unnecessarily red at the moment. The problem and a proper
fix will be properly addressed.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (136473 => 136474)
--- trunk/Tools/ChangeLog 2012-12-04 04:41:12 UTC (rev 136473)
+++ trunk/Tools/ChangeLog 2012-12-04 06:59:22 UTC (rev 136474)
@@ -1,3 +1,18 @@
+2012-12-03 Zan Dobersek <[email protected]>
+
+ Unreviewed, functionality fix after r136437.
+
+ Calling sys.exit actually raises a SystemExit exception that
+ is then handled in the second block and causes the script to
+ return an 'exceptional' exit code rather than the code presenting
+ the number of failed tests.
+
+ This is just a temporary fix to get the faultless bots green while
+ they are unnecessarily red at the moment. The problem and a proper
+ fix will be properly addressed.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2012-12-03 Sheriff Bot <[email protected]>
Unreviewed, rolling out r136460.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (136473 => 136474)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-12-04 04:41:12 UTC (rev 136473)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-12-04 06:59:22 UTC (rev 136474)
@@ -435,5 +435,6 @@
sys.exit(main())
except KeyboardInterrupt:
sys.exit(INTERRUPTED_EXIT_STATUS)
- except:
- sys.exit(EXCEPTIONAL_EXIT_STATUS)
+ except BaseException, e:
+ if e.__class__ is not SystemExit:
+ sys.exit(EXCEPTIONAL_EXIT_STATUS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
