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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); | 76 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); |
77 }) | 77 }) |
78 | 78 |
79 // Note: currently not run on PNaCl because crash throttling causes the last few | 79 // Note: currently not run on PNaCl because crash throttling causes the last few |
80 // tests to fail for the wrong reasons. Enabling this test would also require | 80 // tests to fail for the wrong reasons. Enabling this test would also require |
81 // creating a new set of manifests because shared NaCl/PNaCl manifests are not | 81 // creating a new set of manifests because shared NaCl/PNaCl manifests are not |
82 // allowed. Also not run on GLibc because it's a large test that is at risk of | 82 // allowed. Also not run on GLibc because it's a large test that is at risk of |
83 // causing timeouts. | 83 // causing timeouts. |
84 // crbug/338444 | 84 // crbug/338444 |
85 // crbug.com/375103: fails on Mac after open sourcing PDF plugin. | 85 // crbug.com/375103: fails on Mac after open sourcing PDF plugin. |
86 #if defined(OS_WIN) || defined(OS_MACOSX) | 86 // crbug.com/375103: fails on Linux too after open sourcing PDF plugin. |
| 87 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
87 #define MAYBE_Bad DISABLED_Bad | 88 #define MAYBE_Bad DISABLED_Bad |
88 #else | 89 #else |
89 #define MAYBE_Bad Bad | 90 #define MAYBE_Bad Bad |
90 #endif | 91 #endif |
91 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_Bad) { | 92 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_Bad) { |
92 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad.html")); | 93 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad.html")); |
93 } | 94 } |
94 | 95 |
95 // partially_invalid.c does not have an ARM version of its asm. | 96 // partially_invalid.c does not have an ARM version of its asm. |
96 #if !defined(__arm__) | 97 #if !defined(__arm__) |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 } | 456 } |
456 }; | 457 }; |
457 | 458 |
458 // TODO(ncbray) support glibc and PNaCl | 459 // TODO(ncbray) support glibc and PNaCl |
459 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { | 460 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { |
460 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 461 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
461 "ppapi_extension_mime_handler.html")); | 462 "ppapi_extension_mime_handler.html")); |
462 } | 463 } |
463 | 464 |
464 } // namespace | 465 } // namespace |
OLD | NEW |