OLD | NEW |
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 #if !defined(__arm__) | 73 #if !defined(__arm__) |
74 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { | 74 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, BadNative) { |
75 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad_native.html")); | 75 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_bad_native.html")); |
76 } | 76 } |
77 #endif | 77 #endif |
78 | 78 |
79 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { | 79 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_Crash, { |
80 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); | 80 RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_crash.html")); |
81 }) | 81 }) |
82 | 82 |
| 83 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, { |
| 84 RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html")); |
| 85 }) |
| 86 |
83 // Some versions of Visual Studio does not like preprocessor | 87 // Some versions of Visual Studio does not like preprocessor |
84 // conditionals inside the argument of a macro, so we put the | 88 // conditionals inside the argument of a macro, so we put the |
85 // conditionals on a helper function. We are already in an anonymous | 89 // conditionals on a helper function. We are already in an anonymous |
86 // namespace, so the name of the helper is not visible in external | 90 // namespace, so the name of the helper is not visible in external |
87 // scope. | 91 // scope. |
88 #if defined(OS_POSIX) | 92 #if defined(OS_POSIX) |
89 base::FilePath::StringType NumberOfCoresAsFilePathString() { | 93 base::FilePath::StringType NumberOfCoresAsFilePathString() { |
90 char string_rep[23]; | 94 char string_rep[23]; |
91 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); | 95 long nprocessors = sysconf(_SC_NPROCESSORS_ONLN); |
92 #if TELEMETRY | 96 #if TELEMETRY |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 251 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
248 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); | 252 "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000")); |
249 } | 253 } |
250 | 254 |
251 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { | 255 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) { |
252 RunNaClIntegrationTest(FILE_PATH_LITERAL( | 256 RunNaClIntegrationTest(FILE_PATH_LITERAL( |
253 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); | 257 "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000")); |
254 } | 258 } |
255 | 259 |
256 } // namespace | 260 } // namespace |
OLD | NEW |