commit 674040421e40712df79493ecef62b6af028d657a
author Nicolas Geoffray <ngeoffray@google.com> Mon Jul 01 11:10:55 2019 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jul 01 14:56:29 2019 +0000
tree 7f73066645bf0e52972eb825ed865a74f049eb83
parent e1070377d890f278a49ec8719e66b36860124132

Disable dexdiag_test on fugu.

Bug: 136245508
Test: dexdiag_test
Change-Id: I54b0071bb0cac94d7ae4adb4460c0557fa4c865c

dexlayout/dexdiag_test.cc

diff --git a/dexlayout/dexdiag_test.cc b/dexlayout/dexdiag_test.cc
index 0791e9a..0fc8d80 100644
--- a/dexlayout/dexdiag_test.cc
+++ b/dexlayout/dexdiag_test.cc
@@ -20,6 +20,7 @@
 #include "base/common_art_test.h"
 #include "base/file_utils.h"
 #include "base/os.h"
+#include "common_runtime_test.h"
 #include "exec_utils.h"
 #include "oat_file.h"
 
@@ -113,6 +114,10 @@
 #else
 TEST_F(DexDiagTest, DISABLED_DexDiagContainsTest) {
 #endif
+  if (kIsTargetBuild) {
+    // Disable test on fugu b/136245508
+    TEST_DISABLED_FOR_X86();
+  }
   std::unique_ptr<OatFile> oat = OpenOatAndVdexFiles();
   // TODO: test the resulting output.
   std::string error_msg;
@@ -138,6 +143,10 @@
 #else
 TEST_F(DexDiagTest, DISABLED_DexDiagVerboseTest) {
 #endif
+  if (kIsTargetBuild) {
+    // Disable test on fugu b/136245508
+    TEST_DISABLED_FOR_X86();
+  }
   // TODO: test the resulting output.
   std::unique_ptr<OatFile> oat = OpenOatAndVdexFiles();
   std::string error_msg;