Modified: trunk/Tools/ChangeLog (146255 => 146256)
--- trunk/Tools/ChangeLog 2013-03-19 20:59:14 UTC (rev 146255)
+++ trunk/Tools/ChangeLog 2013-03-19 21:00:28 UTC (rev 146256)
@@ -1,3 +1,12 @@
+2013-03-19 Roger Fong <roger_f...@apple.com>
+
+ Unreviewed. webkitpy tests fix for Windows, runtests.py run-webkit-tests arguments changed.
+
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests.run):
+ * Scripts/webkitpy/tool/steps/runtests_unittest.py:
+ (RunTestsTest.test_webkit_run_unit_tests):
+
2013-03-19 Julie Parent <jpar...@chromium.org>
Dashboards: Introduce history namespace and unit tests.
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (146255 => 146256)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2013-03-19 20:59:14 UTC (rev 146255)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2013-03-19 21:00:28 UTC (rev 146256)
@@ -106,7 +106,6 @@
args.append("--skip-failing-tests")
else:
args.append("--no-build");
- args.append("--release");
if self._options.quiet:
args.append("--quiet")
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py (146255 => 146256)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2013-03-19 20:59:14 UTC (rev 146255)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2013-03-19 21:00:28 UTC (rev 146256)
@@ -26,6 +26,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import platform
+import sys
import unittest2 as unittest
from webkitpy.common.system.outputcapture import OutputCapture
@@ -38,11 +40,22 @@
tool._deprecated_port.run_python_unittests_command = lambda: None
tool._deprecated_port.run_perl_unittests_command = lambda: None
step = RunTests(tool, MockOptions(test=True, non_interactive=True, quiet=False))
- expected_logs = """Running bindings generation tests
+
+ if sys.platform != "cygwin":
+ expected_logs = """Running bindings generation tests
MOCK run_and_throw_if_fail: ['mock-run-bindings-tests'], cwd=/mock-checkout
Running WebKit unit tests
MOCK run_and_throw_if_fail: ['mock-run-webkit-unit-tests'], cwd=/mock-checkout
Running run-webkit-tests
MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures=30', '--quiet', '--skip-failing-tests'], cwd=/mock-checkout
"""
+ else:
+ expected_logs = """Running bindings generation tests
+MOCK run_and_throw_if_fail: ['mock-run-bindings-tests'], cwd=/mock-checkout
+Running WebKit unit tests
+MOCK run_and_throw_if_fail: ['mock-run-webkit-unit-tests'], cwd=/mock-checkout
+Running run-webkit-tests
+MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures=30', '--no-build'], cwd=/mock-checkout
+"""
+
OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
