commit fd1a6c2a08ca3e2476b7424b9b0fa58e73b29e87
author Nicolas Geoffray <ngeoffray@google.com> Tue Oct 04 11:01:17 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Oct 04 11:01:17 2016 +0000
tree 1f3e846a8cf6eef30683dcad63c4dc3ce39c7058
parent 69b58cf399c3507ca3debf9ec9b2db3c5a0fe7f2

Revert "Add dex file writer to dexlayout tool."

Bug: 29921113

This reverts commit 69b58cf399c3507ca3debf9ec9b2db3c5a0fe7f2.

Change-Id: I8bf9b1222d99489059e45f47d220396a853170a4

dexlayout/dexlayout_test.cc

diff --git a/dexlayout/dexlayout_test.cc b/dexlayout/dexlayout_test.cc
index 63dc972..42b64c3 100644
--- a/dexlayout/dexlayout_test.cc
+++ b/dexlayout/dexlayout_test.cc
@@ -36,8 +36,8 @@
     dex_file_ = GetLibCoreDexFileNames()[0];
   }
 
-  // Runs FullPlainOutput test.
-  bool FullPlainOutputExec(std::string* error_msg) {
+  // Runs test with given arguments.
+  bool Exec(std::string* error_msg) {
     // TODO: dexdump2 -> dexdump ?
     ScratchFile dexdump_output;
     std::string dexdump_filename = dexdump_output.GetFilename();
@@ -67,41 +67,6 @@
     return true;
   }
 
-  // Runs FullPlainOutput test.
-  bool DexFileOutputExec(std::string* error_msg) {
-    ScratchFile dexlayout_output;
-    std::string dexlayout_filename = dexlayout_output.GetFilename();
-    std::string dexlayout = GetTestAndroidRoot() + "/bin/dexlayout";
-    EXPECT_TRUE(OS::FileExists(dexlayout.c_str())) << dexlayout << " should be a valid file path";
-    std::vector<std::string> dexlayout_exec_argv =
-        { dexlayout, "-d", "-f", "-h", "-l", "plain", "-w", "-o", dexlayout_filename, dex_file_ };
-
-    if (!::art::Exec(dexlayout_exec_argv, error_msg)) {
-      return false;
-    }
-
-    size_t last_slash = dexlayout_filename.rfind("/");
-    std::string scratch_directory = dexlayout_filename.substr(0, last_slash + 1);
-    std::vector<std::string> unzip_exec_argv =
-        { "/usr/bin/unzip", dex_file_, "classes.dex", "-d", scratch_directory};
-    if (!::art::Exec(unzip_exec_argv, error_msg)) {
-      return false;
-    }
-
-    std::vector<std::string> diff_exec_argv =
-        { "/usr/bin/diff", scratch_directory + "classes.dex" , dex_file_ + ".out" };
-    if (!::art::Exec(diff_exec_argv, error_msg)) {
-      return false;
-    }
-
-    std::vector<std::string> rm_exec_argv = { "/bin/rm", scratch_directory + "classes.dex" };
-    if (!::art::Exec(rm_exec_argv, error_msg)) {
-      return false;
-    }
-
-    return true;
-  }
-
   std::string dex_file_;
 };
 
@@ -110,14 +75,7 @@
   // Disable test on target.
   TEST_DISABLED_FOR_TARGET();
   std::string error_msg;
-  ASSERT_TRUE(FullPlainOutputExec(&error_msg)) << error_msg;
-}
-
-TEST_F(DexLayoutTest, DexFileOutput) {
-  // Disable test on target.
-  TEST_DISABLED_FOR_TARGET();
-  std::string error_msg;
-  ASSERT_TRUE(DexFileOutputExec(&error_msg)) << error_msg;
+  ASSERT_TRUE(Exec(&error_msg)) << error_msg;
 }
 
 }  // namespace art