generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d13e6268: am 385c07a7: Merge "Fix parse of gtest_filter in bionic gtest main."

Browse Source 
* commit 'd13e626817cfd552bf082fb35019177274147449':
  Fix parse of gtest_filter in bionic gtest main.
This commit is contained in:
Yabin Cui
2015-01-27 22:13:28 +00:00
committed by Android Git Automerger
parent 63c74b2c22 d13e626817
commit c10cfc0520
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/gtest_main.cpp
View File

@@ -770,9 +770,14 @@ static bool PickOptions(std::vector<char*>& args, IsolationTestOptions& options)
} else { } else {
if (gtest_filter_str == "") { if (gtest_filter_str == "") {
gtest_filter_str = "--gtest_filter=-bionic_selftest*"; gtest_filter_str = "--gtest_filter=-bionic_selftest*";
} else {
// Find if '-' for NEGATIVE_PATTERNS exists.
if (gtest_filter_str.find(":-") != std::string::npos) {
gtest_filter_str += ":bionic_selftest*";
} else { } else {
gtest_filter_str += ":-bionic_selftest*"; gtest_filter_str += ":-bionic_selftest*";
} }
}
args.push_back(strdup(gtest_filter_str.c_str())); args.push_back(strdup(gtest_filter_str.c_str()));
} }