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

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

Issue 1403793004: Enable NaCl glibc tests on ARM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/nacl/nacl_browsertest_uma.cc ('k') | no next file » | 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 6f360237196ebe3b2b86d2ee177aebff9d00fd66..e556aee1be15a10ccba239df9d6e27444a856acf 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -173,13 +173,11 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
# define MAYBE_PNACL(test_name) test_name
#endif
-// 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) && \
- !defined(DISABLE_NACL_BROWSERTESTS)
-# define MAYBE_GLIBC(test_name) test_name
-#else
+// NaCl glibc toolchain is not available on MIPS
+#if defined(ARCH_CPU_MIPS_FAMILY) || defined(DISABLE_NACL_BROWSERTESTS)
# define MAYBE_GLIBC(test_name) DISABLED_##test_name
+#else
+# define MAYBE_GLIBC(test_name) test_name
#endif
// Currently, we only support it on x86-32 or ARM architecture.
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_uma.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698