summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christopher Ferris <cferris@google.com> 2019-07-16 19:03:32 +0000
committer Christopher Ferris <cferris@google.com> 2019-07-16 22:42:24 +0000
commitb94cc1129aa03e77d001eb3429a8a0efa0d6ac1e (patch)
treedf8fa5e2004827f3de87bbe3e61b92aa6193114a
parentb3b2db7edeaa09751dab44a7d0339590fd7b1788 (diff)
Revert "Disable dexdiag_test on fugu."
This reverts commit 674040421e40712df79493ecef62b6af028d657a. Reason for revert: I think the underlying problem has been fixed. Bug: 136245508 Change-Id: I342be643c3e798caa241a1398210655e395bbadc
-rw-r--r--dexlayout/dexdiag_test.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/dexlayout/dexdiag_test.cc b/dexlayout/dexdiag_test.cc
index 0fc8d8067e..0791e9a563 100644
--- a/dexlayout/dexdiag_test.cc
+++ b/dexlayout/dexdiag_test.cc
@@ -20,7 +20,6 @@
#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"
@@ -114,10 +113,6 @@ TEST_F(DexDiagTest, DexDiagContainsTest) {
#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;
@@ -143,10 +138,6 @@ TEST_F(DexDiagTest, DexDiagVerboseTest) {
#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;