diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-15 21:22:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-15 21:22:30 +0000 |
| commit | e347715fae1315b153f23f2775ef7178b0b73507 (patch) | |
| tree | d2c88ea69381ea1955920b36f6142c4fa4418995 | |
| parent | 233d0cacbaae51d3e30e0a75545819a4bdf56194 (diff) | |
| parent | 8a0a1ebb671bed0c910d35e71bbc083a031f7331 (diff) | |
| download | extras-e347715fae1315b153f23f2775ef7178b0b73507.tar.gz | |
Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing 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 216fe2d1..ebf5a245 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -240,7 +240,8 @@ bool HasHardwareCounter() { if (android::base::ReadFileToString("/proc/cpuinfo", &cpu_info)) { 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"(SC7731e)")) || + std::regex_search(hardware, std::regex(R"(Qualcomm Technologies, Inc MSM8909)"))) { has_hw_counter = 0; } } |