diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-22 10:56:35 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-22 10:56:35 -0400 |
| commit | 0f6567954f42767e2f4a92d9f3b4afa679a65c16 (patch) | |
| tree | 1ff54fc4be37e36266e39f9dfe9b075fae6c96dd /googletest/test | |
| parent | 691e38e518336fa8a9b51915735fe869edb24c08 (diff) | |
| download | googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.tar.gz googletest-0f6567954f42767e2f4a92d9f3b4afa679a65c16.zip | |
more merges
Diffstat (limited to 'googletest/test')
| -rwxr-xr-x | googletest/test/gtest_list_tests_unittest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest_list_tests_unittest.py b/googletest/test/gtest_list_tests_unittest.py index ebf1a3c9..0844f98a 100755 --- a/googletest/test/gtest_list_tests_unittest.py +++ b/googletest/test/gtest_list_tests_unittest.py @@ -70,7 +70,7 @@ FooTest\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? +TypedTest/1\. # TypeParam = int\s*\* TestA TestB TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> @@ -79,7 +79,7 @@ TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? +My/TypeParamTest/1\. # TypeParam = int\s*\* TestA TestB My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42> |
