diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-06 17:14:48 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-06 17:14:49 (GMT) |
| commit | 2f499db00e40e3c893a6e4028732c68ecfe0bda1 (patch) | |
| tree | 6c16016c4d7ec008311ca1120952c37058ee49e3 /googletest/include/gtest | |
| parent | 9f8c3934d515d622e06fa943c5741ccd282b2bf1 (diff) | |
| parent | b953e05bcfca445de42ce14a010798a594bbaf6b (diff) | |
| download | googletest-2f499db00e40e3c893a6e4028732c68ecfe0bda1.zip googletest-2f499db00e40e3c893a6e4028732c68ecfe0bda1.tar.gz googletest-2f499db00e40e3c893a6e4028732c68ecfe0bda1.tar.bz2 | |
Merge pull request #2111 from knuto:pr/remove_slash
PiperOrigin-RevId: 261906004
Diffstat (limited to 'googletest/include/gtest')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-param-util.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h index e900b3f..9753399 100644 --- a/googletest/include/gtest/internal/gtest-param-util.h +++ b/googletest/include/gtest/internal/gtest-param-util.h @@ -565,7 +565,10 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase { test_param_names.insert(param_name); - test_name_stream << test_info->test_base_name << "/" << param_name; + if (!test_info->test_base_name.empty()) { + test_name_stream << test_info->test_base_name << "/"; + } + test_name_stream << param_name; MakeAndRegisterTestInfo( test_suite_name.c_str(), test_name_stream.GetString().c_str(), nullptr, // No type parameter. |