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

Side by Side Diff: webkit/tools/test_shell/run_all_tests.cc

Issue 18248: CommandLine API rework (Closed)
Patch Set: fixes Created 11 years, 11 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
« no previous file with comments | « webkit/tools/test_shell/node_leak_test.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // Run all of our test shell tests. This is just an entry point 5 // Run all of our test shell tests. This is just an entry point
6 // to kick off gTest's RUN_ALL_TESTS(). 6 // to kick off gTest's RUN_ALL_TESTS().
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 30 matching lines...) Expand all
41 41
42 int main(int argc, char* argv[]) { 42 int main(int argc, char* argv[]) {
43 #if defined(OS_MACOSX) 43 #if defined(OS_MACOSX)
44 InitWebCoreSystemInterface(); 44 InitWebCoreSystemInterface();
45 #endif 45 #endif
46 46
47 base::ScopedNSAutoreleasePool autorelease_pool; 47 base::ScopedNSAutoreleasePool autorelease_pool;
48 base::EnableTerminationOnHeapCorruption(); 48 base::EnableTerminationOnHeapCorruption();
49 // Some unittests may use base::Singleton<>, thus we need to instanciate 49 // Some unittests may use base::Singleton<>, thus we need to instanciate
50 // the AtExitManager or else we will leak objects. 50 // the AtExitManager or else we will leak objects.
51 base::AtExitManager at_exit_manager; 51 base::AtExitManager at_exit_manager;
52 52
53 #if defined(OS_LINUX) 53 #if defined(OS_LINUX)
54 gtk_init(&argc, &argv); 54 gtk_init(&argc, &argv);
55 #endif 55 #endif
56 56
57 #if defined(OS_POSIX) 57 CommandLine::Init(argc, argv);
58 CommandLine::SetArgcArgv(argc, argv);
59 #endif
60 58
61 // Suppress error dialogs and do not show GP fault error box on Windows. 59 // Suppress error dialogs and do not show GP fault error box on Windows.
62 TestShell::InitLogging(true, false, false); 60 TestShell::InitLogging(true, false, false);
63 61
64 #if defined(OS_WIN) 62 #if defined(OS_WIN)
65 // Some of the individual tests wind up calling TestShell::WaitTestFinished 63 // Some of the individual tests wind up calling TestShell::WaitTestFinished
66 // which has a timeout in it. For these tests, we don't care about a timeout 64 // which has a timeout in it. For these tests, we don't care about a timeout
67 // so just set it to be a really large number. This is necessary because 65 // so just set it to be a really large number. This is necessary because
68 // when running under Purify, we were hitting those timeouts. 66 // when running under Purify, we were hitting those timeouts.
69 TestShell::SetFileTestTimeout(USER_TIMER_MAXIMUM); 67 TestShell::SetFileTestTimeout(USER_TIMER_MAXIMUM);
(...skipping 22 matching lines...) Expand all
92 90
93 // Run the actual tests 91 // Run the actual tests
94 testing::InitGoogleTest(&argc, argv); 92 testing::InitGoogleTest(&argc, argv);
95 int result = RUN_ALL_TESTS(); 93 int result = RUN_ALL_TESTS();
96 94
97 TestShell::ShutdownTestShell(); 95 TestShell::ShutdownTestShell();
98 TestShell::CleanupLogging(); 96 TestShell::CleanupLogging();
99 97
100 return result; 98 return result;
101 } 99 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/node_leak_test.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698