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

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

Issue 535223002: NaCl: Remove SRPC-based manifest tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 3 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #if defined(OS_WIN) 107 #if defined(OS_WIN)
108 // crbug.com/98721 108 // crbug.com/98721
109 # define MAYBE_Crash DISABLED_Crash 109 # define MAYBE_Crash DISABLED_Crash
110 #else 110 #else
111 # define MAYBE_Crash Crash 111 # define MAYBE_Crash Crash
112 #endif 112 #endif
113 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { 113 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, {
114 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); 114 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html"));
115 }) 115 })
116 116
117 // PNaCl version does not work.
118 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, ManifestFile) {
119 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_manifest_file_test.html"));
120 }
121 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, MAYBE_GLIBC(ManifestFile)) {
122 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_manifest_file_test.html"));
123 }
124 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, PreInitManifestFile) {
125 RunNaClIntegrationTest(FILE_PATH_LITERAL(
126 "pm_pre_init_manifest_file_test.html"));
127 }
128 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc,
129 MAYBE_GLIBC(PreInitManifestFile)) {
130 RunNaClIntegrationTest(FILE_PATH_LITERAL(
131 "pm_pre_init_manifest_file_test.html"));
132 }
133 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) { 117 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
134 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 118 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
135 } 119 }
136 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi, 120 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
137 MAYBE_PNACL_NONSFI(IrtManifestFile)) { 121 MAYBE_PNACL_NONSFI(IrtManifestFile)) {
138 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html")); 122 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
139 } 123 }
140 124
141 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) { 125 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtException) {
142 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html")); 126 RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 } 359 }
376 360
377 // TODO(ncbray) support glibc and PNaCl 361 // TODO(ncbray) support glibc and PNaCl
378 // flaky: crbug.com/375894 362 // flaky: crbug.com/375894
379 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) { 363 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
380 RunNaClIntegrationTest(FILE_PATH_LITERAL( 364 RunNaClIntegrationTest(FILE_PATH_LITERAL(
381 "ppapi_extension_mime_handler.html")); 365 "ppapi_extension_mime_handler.html"));
382 } 366 }
383 367
384 } // namespace 368 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698