Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Side by Side Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 386543002: Disable some tests from NaClBrowserTestNonSfiMode on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 15 matching lines...) Expand all
26 26
27 namespace { 27 namespace {
28 28
29 #if defined(OS_WIN) 29 #if defined(OS_WIN)
30 // crbug.com/98721 30 // crbug.com/98721
31 # define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln 31 # define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln
32 #else 32 #else
33 # define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln 33 # define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln
34 #endif 34 #endif
35 35
36 // crbug.com/392768
37 #if defined(OS_LINUX)
38 # define MAYBE_Messaging DISABLED_Messaging
39 # define MAYBE_Irt DISABLED_Irt
40 #else
41 # define MAYBE_Messaging MAYBE_NONSFI(Messaging)
42 # define MAYBE_Irt MAYBE_NONSFI(Irt)
43 #endif
44
36 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { 45 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
37 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); 46 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
38 }) 47 })
39 48
40 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) { 49 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Messaging) {
41 RunLoadTest(FILE_PATH_LITERAL("libc_free.html")); 50 RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
42 } 51 }
43 52
44 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) { 53 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Irt) {
45 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html")); 54 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
46 } 55 }
47 56
48 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, { 57 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, {
49 RunNaClIntegrationTest(FILE_PATH_LITERAL( 58 RunNaClIntegrationTest(FILE_PATH_LITERAL(
50 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); 59 "pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
51 }) 60 })
52 61
53 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, { 62 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, {
54 RunNaClIntegrationTest(FILE_PATH_LITERAL( 63 RunNaClIntegrationTest(FILE_PATH_LITERAL(
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 #define MAYBE_MimeHandler DISABLED_MimeHandler 458 #define MAYBE_MimeHandler DISABLED_MimeHandler
450 #else 459 #else
451 #define MAYBE_MimeHandler MimeHandler 460 #define MAYBE_MimeHandler MimeHandler
452 #endif 461 #endif
453 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) { 462 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) {
454 RunNaClIntegrationTest(FILE_PATH_LITERAL( 463 RunNaClIntegrationTest(FILE_PATH_LITERAL(
455 "ppapi_extension_mime_handler.html")); 464 "ppapi_extension_mime_handler.html"));
456 } 465 }
457 466
458 } // namespace 467 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698