base/test/test_switches.cc - Issue 7111035: GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: base/test/test_switches.cc

Issue 7111035: GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « base/test/test_switches.h ('k') | base/test/test_timeouts.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/test/test_switches.h"	5 #include "base/test/test_switches.h"

6	6

7 // Time (in milliseconds) for which we wait for live operations to complete.	7 // Time (in milliseconds) for which we wait for live operations to complete.

8 const char switches::kLiveOperationTimeout[] = "live-operation-timeout";	8 const char switches::kLiveOperationTimeout[] = "live-operation-timeout";

9	9

10 // Time (in milliseconds) that the tests should wait before timing out.	10 // Time (in milliseconds) that the tests should wait before timing out.

11 // TODO(phajdan.jr): Clean up the switch names.	11 // TODO(phajdan.jr): Clean up the switch names.

12 const char switches::kTestLargeTimeout[] = "test-large-timeout";	12 const char switches::kTestLargeTimeout[] = "test-large-timeout";

	13 // TODO(phajdan.jr): 'Fix callers and remove --test-terminate-timeout.

	14 const char switches::kTestTerminateTimeout[] = "test-terminate-timeout";

13 const char switches::kTestTinyTimeout[] = "test-tiny-timeout";	15 const char switches::kTestTinyTimeout[] = "test-tiny-timeout";

14 const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";	16 const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";

15 const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";	17 const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";

16 const char switches::kUiTestTerminateTimeout[] = "ui-test-terminate-timeout";	18 const char switches::kUiTestTerminateTimeout[] = "ui-test-terminate-timeout";

17 const char switches::kUiTestTimeout[] = "test-timeout";	19 const char switches::kUiTestTimeout[] = "test-timeout";

OLD	NEW