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

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

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review changes Created 7 years, 4 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
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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 }) 78 })
79 79
80 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, { 80 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, {
81 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html")); 81 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html"));
82 }) 82 })
83 83
84 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, { 84 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, {
85 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html")); 85 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html"));
86 }) 86 })
87 87
88 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PnaclMimeType, {
89 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
90 })
91
88 // Some versions of Visual Studio does not like preprocessor 92 // Some versions of Visual Studio does not like preprocessor
89 // conditionals inside the argument of a macro, so we put the 93 // conditionals inside the argument of a macro, so we put the
90 // conditionals on a helper function. We are already in an anonymous 94 // conditionals on a helper function. We are already in an anonymous
91 // namespace, so the name of the helper is not visible in external 95 // namespace, so the name of the helper is not visible in external
92 // scope. 96 // scope.
93 #if defined(OS_POSIX) 97 #if defined(OS_POSIX)
94 base::FilePath::StringType NumberOfCoresAsFilePathString() { 98 base::FilePath::StringType NumberOfCoresAsFilePathString() {
95 char string_rep[23]; 99 char string_rep[23];
96 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); 100 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN);
97 #if TELEMETRY 101 #if TELEMETRY
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 RunNaClIntegrationTest(FILE_PATH_LITERAL( 185 RunNaClIntegrationTest(FILE_PATH_LITERAL(
182 "pnacl_dyncode_syscall_disabled.html")); 186 "pnacl_dyncode_syscall_disabled.html"));
183 } 187 }
184 188
185 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, 189 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
186 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) { 190 MAYBE_PNACL(PnaclExceptionHandlingDisabled)) {
187 RunNaClIntegrationTest(FILE_PATH_LITERAL( 191 RunNaClIntegrationTest(FILE_PATH_LITERAL(
188 "pnacl_exception_handling_disabled.html")); 192 "pnacl_exception_handling_disabled.html"));
189 } 193 }
190 194
191 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, MAYBE_PNACL(PnaclMimeType)) {
192 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
193 }
194
195 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled,
196 MAYBE_PNACL(PnaclMimeType)) {
197 RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
198 }
199
200 } // namespace 195 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html ('k') | chrome/test/nacl/nacl_browsertest_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698