diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 04:30:00 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 04:30:00 +0000 |
| commit | 9bbfbca8f4cb00837f24629804efeccbfe838d74 (patch) | |
| tree | 6a19ef2b4b09bd01980d3d4578d9e753161089a4 /chrome/test/nacl | |
| parent | 26baa36e171e6f71016ba113891687fd198126ac (diff) | |
| download | chromium_src-9bbfbca8f4cb00837f24629804efeccbfe838d74.zip chromium_src-9bbfbca8f4cb00837f24629804efeccbfe838d74.tar.gz chromium_src-9bbfbca8f4cb00837f24629804efeccbfe838d74.tar.bz2 | |
Disable NaClBrowserTests on Linux ASAN bots.
This change disables all NaClBrowserTests on Linux ASAN bots because they always fail on them.
TBR=victorhsieh
BUG=161709
TEST=make the "Linux ASAN Tests (1)" bot, the "Linux ASAN Tests (2)" bot, and the "Linux ASAN Tests (3)" bot green.
Review URL: https://codereview.chromium.org/11299066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl')
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest.cc | 21 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest_uma.cc | 9 |
2 files changed, 25 insertions, 5 deletions
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc index baec81b..06ae754 100644 --- a/chrome/test/nacl/nacl_browsertest.cc +++ b/chrome/test/nacl/nacl_browsertest.cc @@ -6,11 +6,24 @@ namespace { -NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { +// These tests fail on Linux ASAN bots: <http://crbug.com/161709>. +#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) +#define MAYBE_SimpleLoad DISABLED_SimpleLoad +#define MAYBE_ExitStatus DISABLED_ExitStatus +#define MAYBE_PPAPICore DISABLED_PPAPICore +#define MAYBE_ProgressEvents DISABLED_ProgressEvents +#else +#define MAYBE_SimpleLoad SimpleLoad +#define MAYBE_ExitStatus ExitStatus +#define MAYBE_PPAPICore PPAPICore +#define MAYBE_ProgressEvents ProgressEvents +#endif + +NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_SimpleLoad, { RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); }) -NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus, { +NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ExitStatus, { RunNaClIntegrationTest(FILE_PATH_LITERAL( "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); RunNaClIntegrationTest(FILE_PATH_LITERAL( @@ -21,11 +34,11 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus, { "pm_exit_status_test.html?trigger=exitneg2&expected_exit=254")); }) -NACL_BROWSER_TEST_F(NaClBrowserTest, PPAPICore, { +NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, { RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); }) -NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, { +NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, { RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); }) diff --git a/chrome/test/nacl/nacl_browsertest_uma.cc b/chrome/test/nacl/nacl_browsertest_uma.cc index e67e267..25d58d2 100644 --- a/chrome/test/nacl/nacl_browsertest_uma.cc +++ b/chrome/test/nacl/nacl_browsertest_uma.cc @@ -9,7 +9,14 @@ namespace { -NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, { +// This test fails on Linux ASAN bots: <http://crbug.com/161709>. +#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) +#define MAYBE_SuccessfulLoadUMA DISABLED_SuccessfulLoadUMA +#else +#define MAYBE_SuccessfulLoadUMA SuccessfulLoadUMA +#endif + +NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_SuccessfulLoadUMA, { // Load a NaCl module to generate UMA data. RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); |