commit 5a216c11fbc7f76de5798a9e7fb95381305813ae
author Sen Jiang <senj@google.com> Wed Mar 30 13:08:24 2016 -0700
committer Sen Jiang <senj@google.com> Wed Apr 06 20:28:37 2016 +0000
tree 94b170edbc497e14f7bcd87f09027ee28facbca6
parent e6e4bb929acd73e57b68a30d1e3a33d76607aec3

Fix delta_generator path in integration test.

Moved delta_generator in the target to nativetests.

Test: GTEST_FILTER="DeltaPerformerIntegrationTest.*" \
    /data/nativetest/update_engine_unittests/update_engine_unittests
Test: cros_workon_make update_engine --test
Bug: 26955860

Change-Id: I0846ee3804f6a9fb1ebb82f9f1ad2578486c3882

Android.mk

diff --git a/Android.mk b/Android.mk
index afb14a6..6b63931 100644
--- a/Android.mk
+++ b/Android.mk
@@ -666,7 +666,9 @@
 
 # Build for the target.
 include $(CLEAR_VARS)
-LOCAL_MODULE := delta_generator
+LOCAL_MODULE := ue_unittest_delta_generator
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests
+LOCAL_MODULE_STEM := delta_generator
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
@@ -797,6 +799,7 @@
   LOCAL_MODULE_TAGS := eng
 endif
 LOCAL_REQUIRED_MODULES := \
+    ue_unittest_delta_generator \
     ue_unittest_disk_ext2_1k.img \
     ue_unittest_disk_ext2_4k.img \
     ue_unittest_disk_ext2_4k_empty.img \

payload_consumer/delta_performer_integration_test.cc

diff --git a/payload_consumer/delta_performer_integration_test.cc b/payload_consumer/delta_performer_integration_test.cc
index e2ca77f..afbb8dc 100644
--- a/payload_consumer/delta_performer_integration_test.cc
+++ b/payload_consumer/delta_performer_integration_test.cc
@@ -250,10 +250,11 @@
                                                signature_size, signature_size);
   else
     signature_size_string = base::StringPrintf("%d", signature_size);
+  string delta_generator_path = GetBuildArtifactsPath("delta_generator");
   ASSERT_EQ(0,
             System(base::StringPrintf(
-                "./delta_generator -in_file=%s -signature_size=%s "
-                "-out_hash_file=%s",
+                "%s -in_file=%s -signature_size=%s -out_hash_file=%s",
+                delta_generator_path.c_str(),
                 payload_path.c_str(),
                 signature_size_string.c_str(),
                 hash_file.c_str())));
@@ -282,13 +283,14 @@
 
   ASSERT_EQ(0,
             System(base::StringPrintf(
-                "./delta_generator -in_file=%s -signature_file=%s "
-                "-out_file=%s",
+                "%s -in_file=%s -signature_file=%s -out_file=%s",
+                delta_generator_path.c_str(),
                 payload_path.c_str(),
                 sig_file.c_str(),
                 payload_path.c_str())));
   int verify_result = System(base::StringPrintf(
-      "./delta_generator -in_file=%s -public_key=%s -public_key_version=%d",
+      "%s -in_file=%s -public_key=%s -public_key_version=%d",
+      delta_generator_path.c_str(),
       payload_path.c_str(),
       (signature_test == kSignatureGeneratedShellRotateCl2
            ? GetBuildArtifactsPath(kUnittestPublicKey2Path)