Attachment #80169 for bug #52873

View Details Raw Unified Return to Bug 52873

| Differences between



2011-01-25  Xianzhu Wang  <wangxianzhu@google.com>

        Reviewed by NOBODY (OOPS!).

        Add '--no-timeout' option to Chromium DRT to ease debugging.
        https://bugs.webkit.org/show_bug.cgi?id=52873

        * DumpRenderTree/chromium/DumpRenderTree.cpp:
        (main):

2011-01-25  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Adam Barth.

Lines 58-63 static const char optionEnableAccelerate Tools/DumpRenderTree/chromium/DumpRenderTree.cpp_sec1
- Tools/DumpRenderTree/chromium/DumpRenderTree.cpp +8 lines
58	static const char optionStressOpt[] = "--stress-opt";	58	static const char optionStressOpt[] = "--stress-opt";
59	static const char optionStressDeopt[] = "--stress-deopt";	59	static const char optionStressDeopt[] = "--stress-deopt";
60	static const char optionJavaScriptFlags[] = "--js-flags=";	60	static const char optionJavaScriptFlags[] = "--js-flags=";
		61	static const char optionNoTimeout[] = "--no-timeout=";
61		62
62	static void runTest(TestShell& shell, TestParams& params, const string& testName, bool testShellMode)	63	static void runTest(TestShell& shell, TestParams& params, const string& testName, bool testShellMode)
63	{	64	{
Lines 123-128 int main(int argc, char* argv[]) Tools/DumpRenderTree/chromium/DumpRenderTree.cpp_sec2
123	bool stressDeopt = false;	124	bool stressDeopt = false;
124	bool hardwareAcceleratedGL = false;	125	bool hardwareAcceleratedGL = false;
125	string javaScriptFlags;	126	string javaScriptFlags;
		127	bool noTimeout = false;
126	for (int i = 1; i < argc; ++i) {	128	for (int i = 1; i < argc; ++i) {
127	string argument(argv[i]);	129	string argument(argv[i]);
128	if (argument == "-")	130	if (argument == "-")
Lines 155-160 int main(int argc, char* argv[]) Tools/DumpRenderTree/chromium/DumpRenderTree.cpp_sec3
155	stressDeopt = true;	157	stressDeopt = true;
156	else if (!argument.find(optionJavaScriptFlags))	158	else if (!argument.find(optionJavaScriptFlags))
157	javaScriptFlags = argument.substr(strlen(optionJavaScriptFlags));	159	javaScriptFlags = argument.substr(strlen(optionJavaScriptFlags));
		160	else if (!argument.find(optionNoTimeout))
		161	noTimeout = true;
158	else if (argument.size() && argument[0] == '-')	162	else if (argument.size() && argument[0] == '-')
159	fprintf(stderr, "Unknown option: %s\n", argv[i]);	163	fprintf(stderr, "Unknown option: %s\n", argv[i]);
160	else	164	else
Lines 182-187 int main(int argc, char* argv[]) Tools/DumpRenderTree/chromium/DumpRenderTree.cpp_sec4
182	shell.setJavaScriptFlags(javaScriptFlags);	186	shell.setJavaScriptFlags(javaScriptFlags);
183	shell.setStressOpt(stressOpt);	187	shell.setStressOpt(stressOpt);
184	shell.setStressDeopt(stressDeopt);	188	shell.setStressDeopt(stressDeopt);
		189	if (noTimeout) {
		190	// 0x20000000ms is big enough for the purpose to avoid timeout in debugging.
		191	shell.setLayoutTestTimeout(0x20000000);
		192	}
185	if (serverMode && !tests.size()) {	193	if (serverMode && !tests.size()) {
186	params.printSeparators = true;	194	params.printSeparators = true;
187	char testString[2048]; // 2048 is the same as the sizes of other platforms.	195	char testString[2048]; // 2048 is the same as the sizes of other platforms.

Return to Bug 52873

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +10 lines
		1	2011-01-25 Xianzhu Wang <wangxianzhu@google.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	Add '--no-timeout' option to Chromium DRT to ease debugging.
		6	https://bugs.webkit.org/show_bug.cgi?id=52873
		7
		8	* DumpRenderTree/chromium/DumpRenderTree.cpp:
		9	(main):
		10
1	2011-01-25 Patrick Gansterer <paroga@webkit.org>	11	2011-01-25 Patrick Gansterer <paroga@webkit.org>
2		12
3	Reviewed by Adam Barth.	13	Reviewed by Adam Barth.