commit e5e365be1efc302c41f77595a292a9523f2b7219
author Ian Rogers <irogers@google.com> Fri Oct 17 02:07:35 2014 -0700
committer Ian Rogers <irogers@google.com> Fri Oct 17 02:07:35 2014 -0700
tree 78a692bf89f367f3dee237acda1645d003c15a44
parent 9cb3708f62dad3f32a1ff2fa3f0a745d8d524a32

Disable some instruction set tests due to Linux kernel bugs.

Linux kernels are misreporting CPU features via /proc/cpuinfo and AT_HWCAP.

Change-Id: I422ae0bb674517897bfe9b069d37d4d24736f1d1

runtime/instruction_set_test.cc

diff --git a/runtime/instruction_set_test.cc b/runtime/instruction_set_test.cc
index 948063d..3f2d16b 100644
--- a/runtime/instruction_set_test.cc
+++ b/runtime/instruction_set_test.cc
@@ -221,7 +221,12 @@
 }
 #endif
 
+#if defined(__arm__)
+TEST_F(InstructionSetTest, DISABLED_FeaturesFromCpuInfo) {
+  LOG(WARNING) << "Test disabled due to buggy ARM kernels";
+#else
 TEST_F(InstructionSetTest, FeaturesFromCpuInfo) {
+#endif
   // Take the default set of instruction features from the build.
   std::unique_ptr<const InstructionSetFeatures> instruction_set_features(
       InstructionSetFeatures::FromCppDefines());
@@ -234,7 +239,12 @@
       << "\nFeatures from build: " << *instruction_set_features.get();
 }
 
+#if defined(__arm__)
+TEST_F(InstructionSetTest, DISABLED_FeaturesFromHwcap) {
+  LOG(WARNING) << "Test disabled due to buggy ARM kernels";
+#else
 TEST_F(InstructionSetTest, FeaturesFromHwcap) {
+#endif
   // Take the default set of instruction features from the build.
   std::unique_ptr<const InstructionSetFeatures> instruction_set_features(
       InstructionSetFeatures::FromCppDefines());
@@ -248,7 +258,12 @@
 }
 
 
+#if defined(__arm__)
+TEST_F(InstructionSetTest, DISABLED_FeaturesFromAssembly) {
+  LOG(WARNING) << "Test disabled due to buggy ARM kernels";
+#else
 TEST_F(InstructionSetTest, FeaturesFromAssembly) {
+#endif
   // Take the default set of instruction features from the build.
   std::unique_ptr<const InstructionSetFeatures> instruction_set_features(
       InstructionSetFeatures::FromCppDefines());