diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-17 20:58:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-17 20:58:24 +0000 |
| commit | 9a66ee5c362accc7706b9d54582e89404418e0f7 (patch) | |
| tree | 5e8adc14e630658e81e141ac15855108d18e1463 | |
| parent | e347715fae1315b153f23f2775ef7178b0b73507 (diff) | |
| parent | 1b3a57f1c27a3343923b86a6826f32e30f21db6e (diff) | |
| download | extras-9a66ee5c362accc7706b9d54582e89404418e0f7.tar.gz | |
Merge "simpleperf: add Broadcom STB into whitelist, omit tests requiring hw counters." into pie-cts-dev
| -rw-r--r-- | simpleperf/cmd_record_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index ebf5a245..c09592e8 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -241,7 +241,8 @@ bool HasHardwareCounter() { std::string hardware = GetHardwareFromCpuInfo(cpu_info); if (std::regex_search(hardware, std::regex(R"(i\.MX6.*Quad)")) || std::regex_search(hardware, std::regex(R"(SC7731e)")) || - std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)"))) { + std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)")) || + std::regex_search(hardware, std::regex(R"(Broadcom STB \(Flattened Device Tree\))"))) { has_hw_counter = 0; } } |