diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 00:47:28 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 00:47:28 +0000 |
| commit | 767e9978a48a0d0f2c82988f146e8ff62c6941a3 (patch) | |
| tree | bec0a6d704b1a3f7d0e2dc3347d9cb8f15f6db5a /chrome/test/ui | |
| parent | e2be3ca8bd073fa3e8d16f5f01451e83a9763a94 (diff) | |
| download | chromium_src-767e9978a48a0d0f2c82988f146e8ff62c6941a3.zip chromium_src-767e9978a48a0d0f2c82988f146e8ff62c6941a3.tar.gz chromium_src-767e9978a48a0d0f2c82988f146e8ff62c6941a3.tar.bz2 | |
Break out page load test into its own target on Linux.
Also, build the reliability_tests target on Linux.
Neither of the new targets have trybots or buildbots yet, however, they do work for me locally.
BUG=19085
Review URL: http://codereview.chromium.org/209022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index cacd59d0..7432337 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -46,9 +46,16 @@ static const int kMaxTestExecutionTime = 30000; static const int kWaitForTerminateMsec = 30000; const wchar_t UITest::kFailedNoCrashService[] = +#if defined(OS_WIN) L"NOTE: This test is expected to fail if crash_service.exe is not " L"running. Start it manually before running this test (see the build " L"output directory)."; +#elif defined(OS_LINUX) + L"NOTE: This test is expected to fail if breakpad is not built in " + L"or if chromium is not running headless (try CHROME_HEADLESS=1)."; +#else + L"NOTE: Crash service not ported to this platform!"; +#endif bool UITest::in_process_renderer_ = false; bool UITest::no_sandbox_ = false; bool UITest::full_memory_dump_ = false; @@ -63,7 +70,6 @@ int UITest::timeout_ms_ = 20 * 60 * 1000; std::wstring UITest::js_flags_ = L""; std::wstring UITest::log_level_ = L""; - // Specify the time (in milliseconds) that the ui_tests should wait before // timing out. This is used to specify longer timeouts when running under Purify // which requires much more time. |