Merge 4483e8137a06292a699879c94943e558e702decb into 67cc66080d64e3fa5124fe57ed0cf15e2cecfdeb
This commit is contained in:
commit
9ee6d90319
@ -642,6 +642,8 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
|
|||||||
int line;
|
int line;
|
||||||
};
|
};
|
||||||
typedef ::std::vector<InstantiationInfo> InstantiationContainer;
|
typedef ::std::vector<InstantiationInfo> InstantiationContainer;
|
||||||
|
|
||||||
|
static std::string validParamChars = "_-:/";
|
||||||
|
|
||||||
static bool IsValidParamName(const std::string& name) {
|
static bool IsValidParamName(const std::string& name) {
|
||||||
// Check for empty string
|
// Check for empty string
|
||||||
@ -650,7 +652,7 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
|
|||||||
|
|
||||||
// Check for invalid characters
|
// Check for invalid characters
|
||||||
for (std::string::size_type index = 0; index < name.size(); ++index) {
|
for (std::string::size_type index = 0; index < name.size(); ++index) {
|
||||||
if (!isalnum(name[index]) && name[index] != '_')
|
if (!isalnum(name[index]) && validParamChars.find(name[index]) == std::string::npos)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user