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

Side by Side Diff: chrome/test/nacl/nacl_browsertest_util.h

Issue 1662283002: Disabling some NaCl-related tests on Linux for flakiness (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable instead of enable Created 4 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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 "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \ 188 !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
189 !defined(LEAK_SANITIZER) && \ 189 !defined(LEAK_SANITIZER) && \
190 (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL)) 190 (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL))
191 # define MAYBE_NONSFI(test_case) test_case 191 # define MAYBE_NONSFI(test_case) test_case
192 #else 192 #else
193 # define MAYBE_NONSFI(test_case) DISABLED_##test_case 193 # define MAYBE_NONSFI(test_case) DISABLED_##test_case
194 #endif 194 #endif
195 195
196 // Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or 196 // Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or
197 // ARM linux. 197 // ARM linux.
198 // TODO(crbug.com/579804) -- tests disabled on Linux for flakiness.
198 #if defined(OS_LINUX) && \ 199 #if defined(OS_LINUX) && \
199 (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) && \ 200 (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) && \
200 !defined(DISABLE_NACL_BROWSERTESTS) 201 !defined(DISABLE_NACL_BROWSERTESTS)
201 # define MAYBE_PNACL_NONSFI(test_case) test_case 202 # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
202 #else 203 #else
203 # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case 204 # define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
204 #endif 205 #endif
205 206
206 207
207 #define NACL_BROWSER_TEST_F(suite, name, body) \ 208 #define NACL_BROWSER_TEST_F(suite, name, body) \
208 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ 209 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \
209 body \ 210 body \
210 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ 211 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \
211 body \ 212 body \
212 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ 213 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \
213 body 214 body
214 215
215 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ 216 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698