| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/test/nacl/nacl_browsertest_util.h" | 5 #include "chrome/test/nacl/nacl_browsertest_util.h" |
| 6 | 6 |
| 7 namespace { | 7 namespace { |
| 8 | 8 |
| 9 // These tests fail on Linux ASAN bots: <http://crbug.com/161709>. | 9 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { |
| 10 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) | |
| 11 #define MAYBE_SimpleLoad DISABLED_SimpleLoad | |
| 12 #define MAYBE_ExitStatus DISABLED_ExitStatus | |
| 13 #define MAYBE_PPAPICore DISABLED_PPAPICore | |
| 14 #define MAYBE_ProgressEvents DISABLED_ProgressEvents | |
| 15 #else | |
| 16 #define MAYBE_SimpleLoad SimpleLoad | |
| 17 #define MAYBE_ExitStatus ExitStatus | |
| 18 #define MAYBE_PPAPICore PPAPICore | |
| 19 #define MAYBE_ProgressEvents ProgressEvents | |
| 20 #endif | |
| 21 | |
| 22 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_SimpleLoad, { | |
| 23 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); | 10 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); |
| 24 }) | 11 }) |
| 25 | 12 |
| 26 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ExitStatus, { | 13 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus, { |
| 27 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 14 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 28 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); | 15 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); |
| 29 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 16 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 30 "pm_exit_status_test.html?trigger=exit7&expected_exit=7")); | 17 "pm_exit_status_test.html?trigger=exit7&expected_exit=7")); |
| 31 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 18 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 32 "pm_exit_status_test.html?trigger=exit254&expected_exit=254")); | 19 "pm_exit_status_test.html?trigger=exit254&expected_exit=254")); |
| 33 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 20 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 34 "pm_exit_status_test.html?trigger=exitneg2&expected_exit=254")); | 21 "pm_exit_status_test.html?trigger=exitneg2&expected_exit=254")); |
| 35 }) | 22 }) |
| 36 | 23 |
| 37 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, { | 24 NACL_BROWSER_TEST_F(NaClBrowserTest, PPAPICore, { |
| 38 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); | 25 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); |
| 39 }) | 26 }) |
| 40 | 27 |
| 41 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, { | 28 NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, { |
| 42 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); | 29 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); |
| 43 }) | 30 }) |
| 44 | 31 |
| 45 } // namespace anonymous | 32 } // namespace anonymous |
| OLD | NEW |