- Revision
- 137237
- Author
- dpra...@chromium.org
- Date
- 2012-12-10 18:00:26 -0800 (Mon, 10 Dec 2012)
Log Message
change --no-launch-safari to --no-show-results in scripts
https://bugs.webkit.org/show_bug.cgi?id=104298
Reviewed by Eric Seidel.
Since Safari only exists on the Apple ports, NRWT calls the
command line flag --[no-]show-results instead. This updates
the scripts to use the new flag (but not the buildbot config yet).
* Scripts/generate-coverage-data:
* Scripts/webkit-tools-completion.sh:
* Scripts/webkitpy/tool/steps/runtests.py:
(RunTests.run):
* Scripts/webkitpy/tool/steps/runtests_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137236 => 137237)
--- trunk/Tools/ChangeLog 2012-12-11 01:59:13 UTC (rev 137236)
+++ trunk/Tools/ChangeLog 2012-12-11 02:00:26 UTC (rev 137237)
@@ -1,5 +1,22 @@
2012-12-10 Dirk Pranke <dpra...@chromium.org>
+ change --no-launch-safari to --no-show-results in scripts
+ https://bugs.webkit.org/show_bug.cgi?id=104298
+
+ Reviewed by Eric Seidel.
+
+ Since Safari only exists on the Apple ports, NRWT calls the
+ command line flag --[no-]show-results instead. This updates
+ the scripts to use the new flag (but not the buildbot config yet).
+
+ * Scripts/generate-coverage-data:
+ * Scripts/webkit-tools-completion.sh:
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests.run):
+ * Scripts/webkitpy/tool/steps/runtests_unittest.py:
+
+2012-12-10 Dirk Pranke <dpra...@chromium.org>
+
nrwt: fix mapping of AUDIO onto FAIL when printing unexpected results
https://bugs.webkit.org/show_bug.cgi?id=104597
Modified: trunk/Tools/Scripts/generate-coverage-data (137236 => 137237)
--- trunk/Tools/Scripts/generate-coverage-data 2012-12-11 01:59:13 UTC (rev 137236)
+++ trunk/Tools/Scripts/generate-coverage-data 2012-12-11 02:00:26 UTC (rev 137237)
@@ -60,7 +60,7 @@
print "Building and testing\n";
system("Tools/Scripts/build-webkit", "--coverage", @ARGV) == 0 or die;
-system "Tools/Scripts/new-run-webkit-tests", "--no-launch-safari";
+system "Tools/Scripts/new-run-webkit-tests", "--no-show-results";
system "Tools/Scripts/run-_javascript_core-tests", "--coverage", @ARGV;
# Collect the data and generate a report
Modified: trunk/Tools/Scripts/webkit-tools-completion.sh (137236 => 137237)
--- trunk/Tools/Scripts/webkit-tools-completion.sh 2012-12-11 01:59:13 UTC (rev 137236)
+++ trunk/Tools/Scripts/webkit-tools-completion.sh 2012-12-11 02:00:26 UTC (rev 137237)
@@ -111,4 +111,4 @@
complete -o default -W "--continue --fix-merged --help --no-continue --no-warnings --warnings -c -f -h -w" resolve-ChangeLogs
complete -o default -W "--bug --diff --git-commit --git-index --git-reviewer --help --no-update --no-write --open --update --write -d -h -o" prepare-ChangeLog
complete -W "--clean --debug --help -h" build-webkit
-complete -o default -W "--add-platform-exceptions --complex-text --configuration --guard-malloc --help --http --ignore-tests --launch-safari --leaks --merge-leak-depth --new-test-results --no-http --no-launch-safari --no-new-test-results --no-sample-on-timeout --no-strip-editing-callbacks --pixel-tests --platform --port --quiet --random --reset-results --results-directory --reverse --root --sample-on-timeout --singly --skipped --slowest --strict --strip-editing-callbacks --threaded --timeout --tolerance --use-remote-links-to-tests --valgrind --verbose -1 -c -g -h -i -l -m -o -p -q -t -v" run-webkit-tests
+complete -o default -W "--add-platform-exceptions --complex-text --configuration --guard-malloc --help --http --ignore-tests --launch-safari --leaks --merge-leak-depth --new-test-results --no-http --no-show-results --no-new-test-results --no-sample-on-timeout --no-strip-editing-callbacks --pixel-tests --platform --port --quiet --random --reset-results --results-directory --reverse --root --sample-on-timeout --singly --skipped --slowest --strict --strip-editing-callbacks --threaded --timeout --tolerance --use-remote-links-to-tests --valgrind --verbose -1 -c -g -h -i -l -m -o -p -q -t -v" run-webkit-tests
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (137236 => 137237)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2012-12-11 01:59:13 UTC (rev 137236)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2012-12-11 02:00:26 UTC (rev 137237)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -84,7 +84,7 @@
if self._options.non_interactive:
args.extend([
"--no-new-test-results",
- "--no-launch-safari",
+ "--no-show-results",
"--skip-failing-tests",
"--exit-after-n-failures=%s" % self.NON_INTERACTIVE_FAILURE_LIMIT_COUNT,
"--results-directory=%s" % self._tool.port().results_directory,
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py (137236 => 137237)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2012-12-11 01:59:13 UTC (rev 137236)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2012-12-11 02:00:26 UTC (rev 137237)
@@ -41,6 +41,6 @@
expected_logs = """Running WebKit unit tests
MOCK run_and_throw_if_fail: ['mock-run-webkit-unit-tests', '--gtest_output=xml:/mock-results/webkit_unit_tests_output.xml'], cwd=/mock-checkout
Running run-webkit-tests
-MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--no-new-test-results', '--no-launch-safari', '--skip-failing-tests', '--exit-after-n-failures=30', '--results-directory=/mock-results', '--quiet'], cwd=/mock-checkout
+MOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--no-new-test-results', '--no-show-results', '--skip-failing-tests', '--exit-after-n-failures=30', '--results-directory=/mock-results', '--quiet'], cwd=/mock-checkout
"""
OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
