commit 804fd3831907d94da191a5cb2f7219cd7384b54d
author Tri Vo <trong@google.com> Wed Mar 17 16:55:52 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 17 16:55:52 2021 +0000
tree b39a914daa3acba68132a5660fee1e8a8a8a3113
parent 02eb42b3ef4331e653d1df772c76ab28b2b18cea
parent 29ee062b672a58c8744a9d3d64c931add903abc8

Merge "trusty: fuzz: Poke the port of lazy-loaded TAs to load them." am: 8ac78838fc am: effabd1892 am: 29ee062b67

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1637549

Change-Id: I2bc7456a8c921ae4e002bb605662d56727ce90d5

trusty/fuzz/tipc_fuzzer.cpp

diff --git a/trusty/fuzz/tipc_fuzzer.cpp b/trusty/fuzz/tipc_fuzzer.cpp
index 24b0f98..3258944 100644
--- a/trusty/fuzz/tipc_fuzzer.cpp
+++ b/trusty/fuzz/tipc_fuzzer.cpp
@@ -51,13 +51,21 @@
         exit(-1);
     }
 
+    /* Make sure lazy-loaded TAs have started and connected to coverage service. */
+    TrustyApp ta(TIPC_DEV, TRUSTY_APP_PORT);
+    auto ret = ta.Connect();
+    if (!ret.ok()) {
+        std::cerr << ret.error() << std::endl;
+        exit(-1);
+    }
+
     record = std::make_unique<CoverageRecord>(TIPC_DEV, &module_uuid, TRUSTY_APP_FILENAME);
     if (!record) {
         std::cerr << "Failed to allocate coverage record" << std::endl;
         exit(-1);
     }
 
-    auto ret = record->Open();
+    ret = record->Open();
     if (!ret.ok()) {
         std::cerr << ret.error() << std::endl;
         exit(-1);