pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Christopher Ferris 2018-11-06 13:38:07 -08:00
parent 77a5f95405
commit 9ac0cd5f85
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
benchmarks/tests/interface_test.cpp
View File

@ -63,7 +63,7 @@ static std::string GetBionicXmlArg(const char* xml_file) {
void SystemTests::SanitizeOutput() { void SystemTests::SanitizeOutput() {
// Cut off anything after the arguments, since that varies with time. // 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. // Remove everything before the header.
sanitized_output_.erase(0, sanitized_output_.find("------------------------------------------------")); sanitized_output_.erase(0, sanitized_output_.find("------------------------------------------------"));
@ -165,7 +165,8 @@ TEST_F(SystemTests, help) {
" [--benchmark_filter=<regex>]\n" " [--benchmark_filter=<regex>]\n"
" [--benchmark_min_time=<min_time>]\n" " [--benchmark_min_time=<min_time>]\n"
" [--benchmark_repetitions=<num_repetitions>]\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_format=<console|json|csv>]\n"
" [--benchmark_out=<filename>]\n" " [--benchmark_out=<filename>]\n"
" [--benchmark_out_format=<json|console|csv>]\n" " [--benchmark_out_format=<json|console|csv>]\n"