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

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

Browse Source 
* commit '385c07a74ca5438a6f7fe0ada2b461f880563073':
  Fix parse of gtest_filter in bionic gtest main.
This commit is contained in:
Yabin Cui
2015-01-27 22:05:40 +00:00
committed by Android Git Automerger
parent 6c55034a1d 385c07a74c
commit d13e626817
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 == "") { if (gtest_filter_str == "") {
gtest_filter_str = "--gtest_filter=-bionic_selftest*"; gtest_filter_str = "--gtest_filter=-bionic_selftest*";
} else { } 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())); args.push_back(strdup(gtest_filter_str.c_str()));
} }