Chromium Code Reviews| 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 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 5 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
| 6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \ | 189 !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \ |
| 190 !defined(LEAK_SANITIZER) && \ | 190 !defined(LEAK_SANITIZER) && \ |
| 191 (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) | 191 (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) |
| 192 # define MAYBE_NONSFI(test_case) test_case | 192 # define MAYBE_NONSFI(test_case) test_case |
| 193 #else | 193 #else |
| 194 # define MAYBE_NONSFI(test_case) DISABLED_##test_case | 194 # define MAYBE_NONSFI(test_case) DISABLED_##test_case |
| 195 #endif | 195 #endif |
| 196 | 196 |
| 197 // Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or | 197 // Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or |
| 198 // ARM linux. | 198 // ARM linux. |
| 199 // TODO(crbug.com/579804) -- tests disabled on Linux for flakiness. | |
| 200 #if defined(OS_LINUX) && \ | 199 #if defined(OS_LINUX) && \ |
| 201 (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) | 200 (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) |
|
Sam McNally
2016/10/13 21:11:40
Given the ASAN bot failures, I'm guessing this nee
Mark Seaborn
2016/10/14 19:34:02
I'm not sure what's going on with those ASAN bot f
Mark Seaborn
2016/10/15 00:12:43
OK, done.
| |
| 202 # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case | 201 # define MAYBE_PNACL_NONSFI(test_case) test_case |
| 203 #else | 202 #else |
| 204 # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case | 203 # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case |
| 205 #endif | 204 #endif |
| 206 | 205 |
| 207 | 206 |
| 208 #define NACL_BROWSER_TEST_F(suite, name, body) \ | 207 #define NACL_BROWSER_TEST_F(suite, name, body) \ |
| 209 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ | 208 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ |
| 210 body \ | 209 body \ |
| 211 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ | 210 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ |
| 212 body \ | 211 body \ |
| 213 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ | 212 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ |
| 214 body | 213 body |
| 215 | 214 |
| 216 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 215 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
| OLD | NEW |