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_LINUX) | |
111 // crbug.com/366334 | |
Mark Seaborn
2014/08/28 20:58:39
Can you add BUG=366334 to the commit message, then
teravest
2014/09/03 15:18:22
Done.
| |
112 # define MAYBE_Crash DISABLED_Crash | |
113 #else | 110 #else |
114 # define MAYBE_Crash Crash | 111 # define MAYBE_Crash Crash |
115 #endif | 112 #endif |
116 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { | 113 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { |
117 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); | 114 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); |
118 }) | 115 }) |
119 | 116 |
120 // PNaCl version does not work. | 117 // PNaCl version does not work. |
121 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, ManifestFile) { | 118 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, ManifestFile) { |
122 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_manifest_file_test.html")); | 119 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_manifest_file_test.html")); |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
440 } | 437 } |
441 | 438 |
442 // TODO(ncbray) support glibc and PNaCl | 439 // TODO(ncbray) support glibc and PNaCl |
443 // flaky: crbug.com/375894 | 440 // flaky: crbug.com/375894 |
444 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { | 441 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
445 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 442 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
446 "ppapi_extension_mime_handler.html")); | 443 "ppapi_extension_mime_handler.html")); |
447 } | 444 } |
448 | 445 |
449 } // namespace | 446 } // namespace |
OLD | NEW |