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

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

Browse Source 
* commit 'c10cfc052043b0b70e6a3153e93dabc73764b58f':
  Fix parse of gtest_filter in bionic gtest main.
This commit is contained in:
Yabin Cui
2015-01-28 00:42:21 +00:00
committed by Android Git Automerger
parent 8d71a40c79 c10cfc0520
commit 030ac03c2b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/gtest_main.cpp
View File

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