am d13e6268: am 385c07a7: Merge "Fix parse of gtest_filter in bionic gtest main."
* commit 'd13e626817cfd552bf082fb35019177274147449': Fix parse of gtest_filter in bionic gtest main.
This commit is contained in:
commit
c10cfc0520
@ -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()));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user