commit 80a651b5557e1a3f42bb044a9fee373f01d9914f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 22 16:46:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 22 16:46:46 2018 +0000
tree def947c77b7039acccb2593035e0b771d76e3f25
parent 86cfbe1dff7bd74326f85734426c670dbce44540
parent 9ac6bd988f6e987c1d6e2f7c5bd122e08e87cb4f

Merge "perfetto: fix cts test failure after clock sync"

test/cts/end_to_end_integrationtest_cts.cc

diff --git a/test/cts/end_to_end_integrationtest_cts.cc b/test/cts/end_to_end_integrationtest_cts.cc
index 787be39..2bf1d26 100644
--- a/test/cts/end_to_end_integrationtest_cts.cc
+++ b/test/cts/end_to_end_integrationtest_cts.cc
@@ -58,7 +58,10 @@
                         std::vector<TracePacket> packets, bool has_more) {
       for (auto& packet : packets) {
         ASSERT_TRUE(packet.Decode());
-        ASSERT_TRUE(packet->has_for_testing());
+        ASSERT_TRUE(packet->has_for_testing() || packet->has_clock_snapshot());
+        if (packet->has_clock_snapshot()) {
+          continue;
+        }
         ASSERT_EQ(protos::TracePacket::kTrustedUid,
                   packet->optional_trusted_uid_case());
         ASSERT_EQ(packet->for_testing().seq_value(), rnd_engine());