diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-18 20:46:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-18 20:46:11 +0000 |
| commit | 429c4770daf538112ba0424b919450e5e1228754 (patch) | |
| tree | d5c3e1865b5e16f7d98b9e179a18d86fe84602d5 | |
| parent | 1db5606d0e714f6089a1f347bb75b2800664864d (diff) | |
| parent | 78187abf865df1d335d40419d0060d16cf5ef4bf (diff) | |
| download | extras-429c4770daf538112ba0424b919450e5e1228754.tar.gz | |
Merge "simpleperf: add SC7731E 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 fc32d395..216fe2d1 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -239,7 +239,8 @@ bool HasHardwareCounter() { std::string cpu_info; 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)"))) { + if (std::regex_search(hardware, std::regex(R"(i\.MX6.*Quad)")) || + std::regex_search(hardware, std::regex(R"(SC7731e)")) ) { has_hw_counter = 0; } } |