commit 7fb8dee8e4a52771790b8e94a020579168615872
author Felipe Leme <felipeal@google.com> Fri Aug 25 10:15:01 2017 -0700
committer Felipe Leme <felipeal@google.com> Fri Aug 25 10:18:15 2017 -0700
tree a2fcf20effc9a0fb10df096e5ee621aee67a2c5c
parent 086a02a25f4e24be436411d7cbe86307ae0a6ad7

Fixed dumpstate_test_fixture so it runs on 64 bits as well.

Test: mmm -j32 frameworks/native/cmds/dumpstate/ && adb sync && \
      adb shell /data/nativetest/dumpstate_test/dumpstate_test && \
      adb shell /data/nativetest64/dumpstate_test/dumpstate_test

Fixes: 64954094

Change-Id: I47fa6a6dcee0c3386c5a9b574583d84b20d30661

cmds/dumpstate/tests/dumpstate_test.cpp

diff --git a/cmds/dumpstate/tests/dumpstate_test.cpp b/cmds/dumpstate/tests/dumpstate_test.cpp
index 1c19268..a94cf99 100644
--- a/cmds/dumpstate/tests/dumpstate_test.cpp
+++ b/cmds/dumpstate/tests/dumpstate_test.cpp
@@ -94,7 +94,7 @@
   protected:
     const std::string kTestPath = dirname(android::base::GetExecutablePath().c_str());
     const std::string kFixturesPath = kTestPath + "/../dumpstate_test_fixture/";
-    const std::string kTestDataPath = kFixturesPath + "/testdata/";
+    const std::string kTestDataPath = kFixturesPath + "tests/testdata/";
     const std::string kSimpleCommand = kFixturesPath + "dumpstate_test_fixture";
     const std::string kEchoCommand = "/system/bin/echo";