Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: webkit/tools/test_shell/test_shell_main.cc

Issue 67198: Add concept of slow tests. (Closed)
Patch Set: do git pull, fix diff Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_main.cc
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 58e202d98c8dcef442421108447777c1c30ce198..a0ce4a9cf74470f7ed60801fc288194d079bdc9a 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -263,15 +263,23 @@ int main(int argc, char* argv[]) {
// Watch stdin for URLs.
char filenameBuffer[kPathBufSize];
while (fgets(filenameBuffer, sizeof(filenameBuffer), stdin)) {
- char *newLine = strchr(filenameBuffer, '\n');
+ char* newLine = strchr(filenameBuffer, '\n');
if (newLine)
*newLine = '\0';
if (!*filenameBuffer)
continue;
- params.test_url = filenameBuffer;
+ params.test_url = strtok(filenameBuffer, " ");
+
+ char* timeout = strtok(NULL, " ");
+ int old_timeout_ms = TestShell::GetLayoutTestTimeout();
+ if (timeout)
+ TestShell::SetFileTestTimeout(atoi(timeout));
+
if (!TestShell::RunFileTest(params))
break;
+
+ TestShell::SetFileTestTimeout(old_timeout_ms);
}
} else {
params.test_url = WideToUTF8(uri).c_str();
« no previous file with comments | « webkit/tools/layout_tests/test_expectations.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698