Merge 7754b4042f
into 445e9bd8d0
This commit is contained in:
commit
f2ee5d910c
@ -655,12 +655,15 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
|
|||||||
typedef ::std::vector<InstantiationInfo> InstantiationContainer;
|
typedef ::std::vector<InstantiationInfo> InstantiationContainer;
|
||||||
|
|
||||||
static bool IsValidParamName(const std::string& name) {
|
static bool IsValidParamName(const std::string& name) {
|
||||||
|
static constexpr validParamChars = "_-:/";
|
||||||
|
|
||||||
// Check for empty string
|
// Check for empty string
|
||||||
if (name.empty()) return false;
|
if (name.empty()) return false;
|
||||||
|
|
||||||
// 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] != '_') return false;
|
if (!isalnum(name[index]) && validParamChars.find(name[index]) == std::string::npos)
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user