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 <stdio.h> | 5 #include <stdio.h> |
6 #if defined(OS_POSIX) | 6 #if defined(OS_POSIX) |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 #elif defined(OS_WIN) | 8 #elif defined(OS_WIN) |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif | 10 #endif |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 // partially_invalid.c does not have an ARM version of its asm. | 100 // partially_invalid.c does not have an ARM version of its asm. |
101 #if !defined(__arm__) | 101 #if !defined(__arm__) |
102 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { | 102 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { |
103 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad_native.html")); | 103 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad_native.html")); |
104 } | 104 } |
105 #endif | 105 #endif |
106 | 106 |
107 #if defined(OS_WIN) | 107 #if defined(OS_WIN) |
108 // crbug.com/98721 | 108 // crbug.com/98721 |
109 # define MAYBE_Crash DISABLED_Crash | 109 # define MAYBE_Crash DISABLED_Crash |
| 110 #elif defined(OS_MACOSX) |
| 111 // crbug.com/425570 |
| 112 # define MAYBE_Crash DISABLED_Crash |
110 #else | 113 #else |
111 # define MAYBE_Crash Crash | 114 # define MAYBE_Crash Crash |
112 #endif | 115 #endif |
113 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { | 116 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { |
114 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); | 117 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); |
115 }) | 118 }) |
116 | 119 |
117 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { | 120 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { |
118 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); | 121 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); |
119 } | 122 } |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 } | 364 } |
362 | 365 |
363 // TODO(ncbray) support glibc and PNaCl | 366 // TODO(ncbray) support glibc and PNaCl |
364 // flaky: crbug.com/375894 | 367 // flaky: crbug.com/375894 |
365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { | 368 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
366 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 369 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
367 "ppapi_extension_mime_handler.html")); | 370 "ppapi_extension_mime_handler.html")); |
368 } | 371 } |
369 | 372 |
370 } // namespace | 373 } // namespace |
OLD | NEW |