| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 }) | 94 }) |
| 95 | 95 |
| 96 // Note: currently not run on PNaCl because crash throttling causes the last few | 96 // Note: currently not run on PNaCl because crash throttling causes the last few |
| 97 // tests to fail for the wrong reasons. Enabling this test would also require | 97 // tests to fail for the wrong reasons. Enabling this test would also require |
| 98 // creating a new set of manifests because shared NaCl/PNaCl manifests are not | 98 // creating a new set of manifests because shared NaCl/PNaCl manifests are not |
| 99 // allowed. Also not run on GLibc because it's a large test that is at risk of | 99 // allowed. Also not run on GLibc because it's a large test that is at risk of |
| 100 // causing timeouts. | 100 // causing timeouts. |
| 101 // crbug/338444 | 101 // crbug/338444 |
| 102 #if defined(OS_WIN) | 102 #if defined(OS_WIN) |
| 103 #define MAYBE_Bad DISABLED_Bad | 103 #define MAYBE_Bad DISABLED_Bad |
| 104 #elif defined(OS_LINUX) |
| 105 // See http://crbug.com/448596 |
| 106 #define MAYBE_Bad DISABLED_Bad |
| 104 #else | 107 #else |
| 105 #define MAYBE_Bad Bad | 108 #define MAYBE_Bad Bad |
| 106 #endif | 109 #endif |
| 107 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_Bad) { | 110 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_Bad) { |
| 108 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad.html")); | 111 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad.html")); |
| 109 } | 112 } |
| 110 | 113 |
| 111 // partially_invalid.c does not have an ARM version of its asm. | 114 // partially_invalid.c does not have an ARM version of its asm. |
| 112 #if !defined(__arm__) | 115 #if !defined(__arm__) |
| 113 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { | 116 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 } | 416 } |
| 414 | 417 |
| 415 // TODO(ncbray) support glibc and PNaCl | 418 // TODO(ncbray) support glibc and PNaCl |
| 416 // flaky: crbug.com/375894 | 419 // flaky: crbug.com/375894 |
| 417 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { | 420 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
| 418 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 421 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 419 "ppapi_extension_mime_handler.html")); | 422 "ppapi_extension_mime_handler.html")); |
| 420 } | 423 } |
| 421 | 424 |
| 422 } // namespace | 425 } // namespace |
| OLD | NEW |