commit e013f6a4276dc44f7e99122b42d3c77bc45a4f21
author Alex Deymo <deymo@google.com> Thu Mar 23 03:08:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 23 03:08:22 2017 +0000
tree c6dd6f1f29868c8922f1017c76e97c958c32aff0
parent 8ad358c3f3e4e81745f3d00ce5cedaddb2787d87
parent a6dc0fe787733d489f403b5162d99a78e17517f4

Fix the path to zlib_fingerprint.
am: a6dc0fe787

Change-Id: I57367c3a9cc58d58371cb20bcbfb9d83efc6f87d

payload_consumer/delta_performer_unittest.cc

diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc
index 09bbb7c..53e4ed0 100644
--- a/payload_consumer/delta_performer_unittest.cc
+++ b/payload_consumer/delta_performer_unittest.cc
@@ -68,13 +68,6 @@
     "fjoTeLYZpt+WN65Vu7jJ0cQN8e1y+2yka5112wpRf/LLtPgiAjEZnsoYpLUd7CoV"
     "pLRtClp97kN2+tXGNBQqkA==";
 
-#ifdef __ANDROID__
-const char kZlibFingerprintPath[] =
-    "/data/nativetest/update_engine_unittests/zlib_fingerprint";
-#else
-const char kZlibFingerprintPath[] = "/etc/zlib_fingerprint";
-#endif  // __ANDROID__
-
 // Different options that determine what we should fill into the
 // install_plan.metadata_signature to simulate the contents received in the
 // Omaha response.
@@ -906,6 +899,12 @@
 // kCompatibleZlibFingerprint.
 TEST_F(DeltaPerformerTest, ZlibFingerprintMatch) {
   string fingerprint;
+#ifdef __ANDROID__
+  const std::string kZlibFingerprintPath =
+      test_utils::GetBuildArtifactsPath("zlib_fingerprint");
+#else
+  const std::string kZlibFingerprintPath = "/etc/zlib_fingerprint";
+#endif  // __ANDROID__
   EXPECT_TRUE(base::ReadFileToString(base::FilePath(kZlibFingerprintPath),
                                      &fingerprint));
   EXPECT_TRUE(utils::IsZlibCompatible(fingerprint));