summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2017-05-04 09:58:59 -0700
committer Colin Cross <ccross@android.com> 2017-05-04 10:27:21 -0700
commit99c9bf65ae84264498b9d6562cf5bf298e1c584f (patch)
tree0800ba8c8d695ecf72225d276525cd449e2f5cca
parente9e6052f633a994c2cfd5217ab1ee091a9d77a07 (diff)
Fix 64-bit GraphicStats.findRootPath test
frameworks/base/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp:54: Failure Value of: findRootPath() Actual: "/data/nativetest64/hwui_unit_tests" Expected: expected Which is: "/data/nativetest/hwui_unit_tests" [ FAILED ] GraphicsStats.findRootPath (1 ms) Test: hwui_unit_tests Change-Id: I809fcc9d5f640ecd4248a8ae2272c72ba4bd2cdd
-rw-r--r--libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp b/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp
index cfe11347ff35..f6f73377e147 100644
--- a/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp
+++ b/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp
@@ -50,7 +50,11 @@ std::string findRootPath() {
// No code left untested
TEST(GraphicsStats, findRootPath) {
+#ifdef __LP64__
+ std::string expected = "/data/nativetest64/hwui_unit_tests";
+#else
std::string expected = "/data/nativetest/hwui_unit_tests";
+#endif
EXPECT_EQ(expected, findRootPath());
}
@@ -156,4 +160,4 @@ TEST(GraphicsStats, merge) {
EXPECT_EQ(expectedCount, loadedProto.histogram().Get(i).frame_count());
EXPECT_EQ(expectedBucket, loadedProto.histogram().Get(i).render_millis());
}
-} \ No newline at end of file
+}