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

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

Issue 794573002: Enable transitional non-SFI browser tests on ARM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for including NaCl roll Created 5 years, 11 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
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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 }) 159 })
160 160
161 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { 161 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
162 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 162 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
163 } 163 }
164 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 164 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
165 MAYBE_PNACL_NONSFI(IrtManifestFile)) { 165 MAYBE_PNACL_NONSFI(IrtManifestFile)) {
166 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 166 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
167 } 167 }
168 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi, 168 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi,
169 MAYBE_PNACL_TRANSITIONAL_NONSFI(IrtManifestFile)) { 169 MAYBE_PNACL_NONSFI(IrtManifestFile)) {
170 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 170 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
171 } 171 }
172 172
173 #if defined(OS_WIN) 173 #if defined(OS_WIN)
174 // http://crbug.com/416272 174 // http://crbug.com/416272
175 #define MAYBE_IrtException DISABLED_IrtException 175 #define MAYBE_IrtException DISABLED_IrtException
176 #else 176 #else
177 #define MAYBE_IrtException IrtException 177 #define MAYBE_IrtException IrtException
178 #endif 178 #endif
179 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) { 179 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, MAYBE_IrtException) {
180 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 180 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
181 } 181 }
182 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 182 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
183 MAYBE_PNACL_NONSFI(IrtException)) { 183 MAYBE_PNACL_NONSFI(IrtException)) {
184 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 184 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
185 } 185 }
186 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi, 186 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclTransitionalNonSfi,
187 MAYBE_PNACL_TRANSITIONAL_NONSFI(IrtException)) { 187 MAYBE_PNACL_NONSFI(IrtException)) {
188 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 188 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
189 } 189 }
190 190
191 // Some versions of Visual Studio does not like preprocessor 191 // Some versions of Visual Studio does not like preprocessor
192 // conditionals inside the argument of a macro, so we put the 192 // conditionals inside the argument of a macro, so we put the
193 // conditionals on a helper function. We are already in an anonymous 193 // conditionals on a helper function. We are already in an anonymous
194 // namespace, so the name of the helper is not visible in external 194 // namespace, so the name of the helper is not visible in external
195 // scope. 195 // scope.
196 #if defined(OS_POSIX) 196 #if defined(OS_POSIX)
197 base::FilePath::StringType NumberOfCoresAsFilePathString() { 197 base::FilePath::StringType NumberOfCoresAsFilePathString() {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 } 413 }
414 414
415 // TODO(ncbray) support glibc and PNaCl 415 // TODO(ncbray) support glibc and PNaCl
416 // flaky: crbug.com/375894 416 // flaky: crbug.com/375894
417 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 417 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
418 RunNaClIntegrationTest(FILE_PATH_LITERAL( 418 RunNaClIntegrationTest(FILE_PATH_LITERAL(
419 "ppapi_extension_mime_handler.html")); 419 "ppapi_extension_mime_handler.html"));
420 } 420 }
421 421
422 } // namespace 422 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698