Snap for 4739962 from b17f08162a554e3c1c48887cf0997e68ff458a00 to pi-release

Change-Id: I8d4ac5324eb60b9342e7fd390c610e160a93deb7

1 files changed, 11 insertions, 0 deletions

diff --git a/test/cts/end_to_end_integrationtest_cts.cc b/test/cts/end_to_end_integrationtest_cts.cc
index 439227189..d40d92fd5 100644
--- a/test/cts/end_to_end_integrationtest_cts.cc
+++ b/test/cts/end_to_end_integrationtest_cts.cc
@@ -15,6 +15,7 @@
  */
 
 #include <random>
+#include <sys/system_properties.h>
 
 #include "gtest/gtest.h"
 #include "perfetto/trace/test_event.pbzero.h"
@@ -32,6 +33,16 @@ namespace perfetto {
 class PerfettoCtsTest : public ::testing::Test {
  protected:
   void TestMockProducer(const std::string& producer_name) {
+    // Filter out watches; they do not have the required infrastructure to run
+    // these tests.
+    char chars[PROP_VALUE_MAX + 1];
+    int ret = __system_property_get("ro.build.characteristics", chars);
+    ASSERT_GE(ret, 0);
+    std::string characteristics(chars);
+    if (characteristics.find("watch") != std::string::npos) {
+      return;
+    }
+
     base::TestTaskRunner task_runner;
 
     TestHelper helper(&task_runner);