diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2016-06-28 10:47:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 10:47:48 -0400 |
| commit | 81345850725f06b0c36c96fb8c8bccd0b0f57e50 (patch) | |
| tree | 78dc3333324f2548415c084a181b44cc490f66bc /googletest/test | |
| parent | 10799abad25aa9ec7dcd08d9a46cad093f8bb074 (diff) | |
| parent | 43c0ae3375361107286d92e71dc043ae522e7ee4 (diff) | |
| download | googletest-81345850725f06b0c36c96fb8c8bccd0b0f57e50.tar.gz googletest-81345850725f06b0c36c96fb8c8bccd0b0f57e50.tar.bz2 googletest-81345850725f06b0c36c96fb8c8bccd0b0f57e50.zip | |
Merge pull request #723 from KindDragon/master
Run MSVC tests on AppVeyor
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 925b09d9..f2d2fd1b 100755 --- a/googletest/test/gtest_list_tests_unittest.py +++ b/googletest/test/gtest_list_tests_unittest.py @@ -71,7 +71,7 @@ FooTest\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -TypedTest/1\. # TypeParam = int\s*\* +TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> @@ -80,7 +80,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*\* +My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42> |