| 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 // These tests fail on Linux ASAN bots: <http://crbug.com/161709>. |
| 10 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) | 10 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 92 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
| 93 MAYBE_PNACL(PnaclNMFOptionsOlarge)) { | 93 MAYBE_PNACL(PnaclNMFOptionsOlarge)) { |
| 94 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_large")); | 94 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=o_large")); |
| 95 } | 95 } |
| 96 | 96 |
| 97 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, | 97 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
| 98 MAYBE_PNACL(PnaclNMFOptionsTimePasses)) { | 98 MAYBE_PNACL(PnaclNMFOptionsTimePasses)) { |
| 99 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=time_passes")); | 99 RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=time_passes")); |
| 100 } | 100 } |
| 101 | 101 |
| 102 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, |
| 103 MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) { |
| 104 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 105 "pnacl_dyncode_syscall_disabled.html")); |
| 106 } |
| 107 |
| 102 } // namespace anonymous | 108 } // namespace anonymous |
| OLD | NEW |