commit 542ce20c761395cf5d5bbe7469adedd57bd24311
author Lev Rumyantsev <levarum@google.com> Mon Feb 03 19:17:19 2020 -0800
committer Lev Rumyantsev <levarum@google.com> Mon Feb 03 19:17:19 2020 -0800
tree 380519eb546ea324f0956dcfaef4f72283dbf2cb
parent fb0ab4b1790f0b66fca4506d6a2c53a9f91de2e2

Skip native-bridged tests on x86

When running non-native code (e.g. arm on x86) using native-bridge
translator, we are still profiling x86 processes. Skip tests in this
case as they are disabled for native x86. To do so, check real machine
architecture using uname().

Test: CtsPerfettoTestCases:HeapprofdCtsTest -- \
--abi=armeabi-v7a / --abi=x86
on Android10 Emulator with ARM support
Bug: 148826652

Change-Id: Ib476e636167bc3bfb1c85431aae6e714c630f4d8

test/cts/heapprofd_test_cts.cc

diff --git a/test/cts/heapprofd_test_cts.cc b/test/cts/heapprofd_test_cts.cc
index 8cbca11..fb489df 100644
--- a/test/cts/heapprofd_test_cts.cc
+++ b/test/cts/heapprofd_test_cts.cc
@@ -17,10 +17,13 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 
 #include <sys/system_properties.h>
 
+#include <string>
+
 #include "gtest/gtest.h"
 #include "perfetto/base/logging.h"
 #include "src/base/test/test_task_runner.h"
@@ -128,7 +131,7 @@
 
   TraceConfig trace_config;
   trace_config.add_buffers()->set_size_kb(10 * 1024);
-  trace_config.set_duration_ms(4000);
+  trace_config.set_duration_ms(2000);
 
   auto* ds_config = trace_config.add_data_sources()->mutable_config();
   ds_config->set_name("android.heapprofd");
@@ -228,27 +231,38 @@
 }
 
 // TODO(b/118428762): look into unwinding issues on x86.
-#if defined(__i386__) || defined(__x86_64__)
-#define MAYBE_SKIP(x) DISABLED_##x
-#else
-#define MAYBE_SKIP(x) x
-#endif
+bool IsUnameX86() {
+  struct utsname uname_data;
+  uname(&uname_data);
+  std::string machine = uname_data.machine;
+  // Matches both i386 and x86_64.
+  return machine.find("86") != std::string::npos;
+}
 
-TEST(HeapprofdCtsTest, MAYBE_SKIP(DebuggableAppRuntime)) {
+TEST(HeapprofdCtsTest, DebuggableAppRuntime) {
+  if (IsUnameX86()) {
+    GTEST_SKIP() << "Test is disabled on x86 devices";
+  }
   std::string app_name = "android.perfetto.cts.app.debuggable";
   const auto& packets = ProfileRuntime(app_name);
   AssertExpectedAllocationsPresent(packets);
   StopApp(app_name);
 }
 
-TEST(HeapprofdCtsTest, MAYBE_SKIP(DebuggableAppStartup)) {
+TEST(HeapprofdCtsTest, DebuggableAppStartup) {
+  if (IsUnameX86()) {
+    GTEST_SKIP() << "Test is disabled on x86 devices";
+  }
   std::string app_name = "android.perfetto.cts.app.debuggable";
   const auto& packets = ProfileStartup(app_name);
   AssertExpectedAllocationsPresent(packets);
   StopApp(app_name);
 }
 
-TEST(HeapprofdCtsTest, MAYBE_SKIP(ReleaseAppRuntime)) {
+TEST(HeapprofdCtsTest, ReleaseAppRuntime) {
+  if (IsUnameX86()) {
+    GTEST_SKIP() << "Test is disabled on x86 devices";
+  }
   std::string app_name = "android.perfetto.cts.app.release";
   const auto& packets = ProfileRuntime(app_name);
 
@@ -260,7 +274,10 @@
   StopApp(app_name);
 }
 
-TEST(HeapprofdCtsTest, MAYBE_SKIP(ReleaseAppStartup)) {
+TEST(HeapprofdCtsTest, ReleaseAppStartup) {
+  if (IsUnameX86()) {
+    GTEST_SKIP() << "Test is disabled on x86 devices";
+  }
   std::string app_name = "android.perfetto.cts.app.release";
   const auto& packets = ProfileStartup(app_name);