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

Unified Diff: chrome/test/nacl/nacl_browsertest_util.h

Issue 1274213005: Disable NaCl browser_tests for GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/BUILD.gn ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_browsertest_util.h
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index 94b9f2dafa0a1c68cb30241f2ef4de23433eccbd..b6326a9e525a9ad11e02f818ca1027b54fbf1bd8 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -174,7 +174,8 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
// NaCl glibc tests are included for x86 only, as there is no glibc support
// for other architectures (ARM/MIPS).
-#if defined(ARCH_CPU_X86_FAMILY)
+#if defined(ARCH_CPU_X86_FAMILY) && \
+ !defined(DISABLE_NACL_BROWSERTESTS)
# define MAYBE_GLIBC(test_name) test_name
#else
# define MAYBE_GLIBC(test_name) DISABLED_##test_name
@@ -194,7 +195,8 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
// Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or
// ARM linux.
#if defined(OS_LINUX) && \
- (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL))
+ (defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)) && \
+ !defined(DISABLE_NACL_BROWSERTESTS)
# define MAYBE_PNACL_NONSFI(test_case) test_case
#else
# define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
« no previous file with comments | « chrome/test/BUILD.gn ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698