diff options
| author | Christopher Ferris <cferris@google.com> | 2018-11-06 13:38:07 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2018-11-07 14:30:55 -0800 |
| commit | 9ac0cd5f85f9b9607bafa16d6e78393d69c08c0c (patch) | |
| tree | f7bf4a29a60edfbc7d5d6948578cf83178712ac9 /benchmarks | |
| parent | 77a5f95405bec7b5fa717c29464b4fc3b62d1db1 (diff) | |
| download | android_bionic-9ac0cd5f85f9b9607bafa16d6e78393d69c08c0c.tar.gz android_bionic-9ac0cd5f85f9b9607bafa16d6e78393d69c08c0c.tar.bz2 android_bionic-9ac0cd5f85f9b9607bafa16d6e78393d69c08c0c.zip | |
Fix test failures.
- Fix the help output for new benchmarks help output.
- Fix incorrect regex for sanitizing output.
Test: Ran unit tests and they pass.
Change-Id: I227eef3ce8c4ce639321e5ab8a57d0877063ede1
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/tests/interface_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/benchmarks/tests/interface_test.cpp b/benchmarks/tests/interface_test.cpp index ff4b25599..301c294e8 100644 --- a/benchmarks/tests/interface_test.cpp +++ b/benchmarks/tests/interface_test.cpp @@ -63,7 +63,7 @@ static std::string GetBionicXmlArg(const char* xml_file) { void SystemTests::SanitizeOutput() { // Cut off anything after the arguments, since that varies with time. - sanitized_output_ = std::regex_replace(raw_output_, std::regex(".+(BM_\\S+) +.+"), "$1"); + sanitized_output_ = std::regex_replace(raw_output_, std::regex(".*(BM_\\S+)\\s+.+"), "$1"); // Remove everything before the header. sanitized_output_.erase(0, sanitized_output_.find("------------------------------------------------")); @@ -165,7 +165,8 @@ TEST_F(SystemTests, help) { " [--benchmark_filter=<regex>]\n" " [--benchmark_min_time=<min_time>]\n" " [--benchmark_repetitions=<num_repetitions>]\n" - " [--benchmark_report_aggregates_only={true|false}\n" + " [--benchmark_report_aggregates_only={true|false}]\n" + " [--benchmark_display_aggregates_only={true|false}]\n" " [--benchmark_format=<console|json|csv>]\n" " [--benchmark_out=<filename>]\n" " [--benchmark_out_format=<json|console|csv>]\n" |