| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 437 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 438 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); | 438 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); |
| 439 } | 439 } |
| 440 | 440 |
| 441 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { | 441 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { |
| 442 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 442 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 443 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); | 443 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); |
| 444 } | 444 } |
| 445 | 445 |
| 446 // TODO(ncbray) support glibc and PNaCl | 446 // TODO(ncbray) support glibc and PNaCl |
| 447 #if defined(OS_MACOSX) | 447 // flaky: crbug.com/375894 |
| 448 // crbug.com/375894 | 448 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { |
| 449 #define MAYBE_MimeHandler DISABLED_MimeHandler | |
| 450 #else | |
| 451 #define MAYBE_MimeHandler MimeHandler | |
| 452 #endif | |
| 453 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { | |
| 454 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 449 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
| 455 "ppapi_extension_mime_handler.html")); | 450 "ppapi_extension_mime_handler.html")); |
| 456 } | 451 } |
| 457 | 452 |
| 458 } // namespace | 453 } // namespace |
| OLD | NEW |