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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
363 } | 363 } |
364 | 364 |
365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { | 365 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) { |
366 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); | 366 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); |
367 } | 367 } |
368 | 368 |
369 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) { | 369 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) { |
370 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); | 370 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html")); |
371 } | 371 } |
372 | 372 |
373 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) | |
Mark Seaborn
2014/04/23 03:49:50
Could you copy the MAYBE_NONSFI #define from ppapi
Junichi Uekawa
2014/04/23 07:56:15
Done.
| |
374 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, SignalCrash) { | |
375 RunNaClIntegrationTest(FILE_PATH_LITERAL( | |
376 "nonsfi_crash_via_signal_handler.html")); | |
377 } | |
378 #endif | |
379 | |
373 class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib { | 380 class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib { |
374 public: | 381 public: |
375 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { | 382 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |
376 // Env needs to be set early because nacl_helper is spawned before the test | 383 // Env needs to be set early because nacl_helper is spawned before the test |
377 // body on Linux. | 384 // body on Linux. |
378 scoped_ptr<base::Environment> env(base::Environment::Create()); | 385 scoped_ptr<base::Environment> env(base::Environment::Create()); |
379 env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage"); | 386 env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage"); |
380 NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture(); | 387 NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture(); |
381 } | 388 } |
382 }; | 389 }; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
448 } | 455 } |
449 }; | 456 }; |
450 | 457 |
451 // TODO(ncbray) support glibc and PNaCl | 458 // TODO(ncbray) support glibc and PNaCl |
452 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { | 459 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { |
453 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 460 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
454 "ppapi_extension_mime_handler.html")); | 461 "ppapi_extension_mime_handler.html")); |
455 } | 462 } |
456 | 463 |
457 } // namespace | 464 } // namespace |
OLD | NEW |