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

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

Issue 249183004: Implement open_resource in non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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 | « chrome/test/data/nacl/nacl_test_data.gyp ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | 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 19 matching lines...) Expand all
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 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, { 36 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
37 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); 37 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
38 }) 38 })
39 39
40 // ASan does not work with libc-free context, so disable the test. 40 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
41 #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
42 # define MAYBE_NonSfiMessaging NonSfiMessaging
43 #else
44 # define MAYBE_NonSfiMessaging DISABLED_NonSfiMessaging
45 #endif
46
47 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiMessaging) {
48 RunLoadTest(FILE_PATH_LITERAL("libc_free.html")); 41 RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
49 } 42 }
50 43
51 // ASan does not work with libc-free context, so disable the test. 44 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
52 #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
53 # define MAYBE_NonSfiIrt NonSfiIrt
54 #else
55 # define MAYBE_NonSfiIrt DISABLED_NonSfiIrt
56 #endif
57
58 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiIrt) {
59 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html")); 45 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
60 } 46 }
61 47
62 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, { 48 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, {
63 RunNaClIntegrationTest(FILE_PATH_LITERAL( 49 RunNaClIntegrationTest(FILE_PATH_LITERAL(
64 "pm_exit_status_test.html?trigger=exit0&expected_exit=0")); 50 "pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
65 }) 51 })
66 52
67 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, { 53 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, {
68 RunNaClIntegrationTest(FILE_PATH_LITERAL( 54 RunNaClIntegrationTest(FILE_PATH_LITERAL(
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 RunNaClIntegrationTest(FILE_PATH_LITERAL( 122 RunNaClIntegrationTest(FILE_PATH_LITERAL(
137 "pm_pre_init_manifest_file_test.html")); 123 "pm_pre_init_manifest_file_test.html"));
138 } 124 }
139 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) { 125 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) {
140 RunNaClIntegrationTest(FILE_PATH_LITERAL( 126 RunNaClIntegrationTest(FILE_PATH_LITERAL(
141 "pm_pre_init_manifest_file_test.html")); 127 "pm_pre_init_manifest_file_test.html"));
142 } 128 }
143 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { 129 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
144 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 130 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
145 } 131 }
146 132 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
147 // The NonSFI test is currently available only on linux-x86-32 133 MAYBE_PNACL_NONSFI(IrtManifestFile)) {
148 // architecture. 134 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
149 #if defined(OS_LINUX) && defined(ARCH_CPU_X86) 135 }
150 #define MAYBE_NONSFI(test_name) test_name
151 #else
152 #define MAYBE_NONSFI(test_name) DISABLED_##test_name
153 #endif
154 136
155 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { 137 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) {
156 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 138 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
157 } 139 }
158 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 140 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
159 MAYBE_NONSFI(IrtException)) { 141 MAYBE_PNACL_NONSFI(IrtException)) {
160 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 142 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
161 } 143 }
162 144
163 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { 145 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, {
164 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); 146 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html"));
165 }) 147 })
166 148
167 // Some versions of Visual Studio does not like preprocessor 149 // Some versions of Visual Studio does not like preprocessor
168 // conditionals inside the argument of a macro, so we put the 150 // conditionals inside the argument of a macro, so we put the
169 // conditionals on a helper function. We are already in an anonymous 151 // conditionals on a helper function. We are already in an anonymous
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 } 453 }
472 }; 454 };
473 455
474 // TODO(ncbray) support glibc and PNaCl 456 // TODO(ncbray) support glibc and PNaCl
475 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) { 457 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) {
476 RunNaClIntegrationTest(FILE_PATH_LITERAL( 458 RunNaClIntegrationTest(FILE_PATH_LITERAL(
477 "ppapi_extension_mime_handler.html")); 459 "ppapi_extension_mime_handler.html"));
478 } 460 }
479 461
480 } // namespace 462 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/nacl_test_data.gyp ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698