gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more merging

Browse Source
This commit is contained in:
Gennadiy Civil
2018-01-22 14:43:51 -05:00
parent a0435a54ce
commit 9bc86661f8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
googletest/test/gtest_list_tests_unittest.py
View File

@@ -39,8 +39,9 @@ Google Test) the command line flags.
__author__ = 'phanna@google.com (Patrick Hanna)' __author__ = 'phanna@google.com (Patrick Hanna)'
import re
import gtest_test_utils import gtest_test_utils
import re
# Constants. # Constants.
@@ -70,7 +71,7 @@ FooTest\.
TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
TestA TestA
TestB TestB
TypedTest/1\. # TypeParam = int\s*\* TypedTest/1\. # TypeParam = int\s*\*( __ptr64)?
TestA TestA
TestB TestB
TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42> TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42>
@@ -79,7 +80,7 @@ TypedTest/2\. # TypeParam = .*MyArray<bool,\s*42>
My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
TestA TestA
TestB TestB
My/TypeParamTest/1\. # TypeParam = int\s*\* My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)?
TestA TestA
TestB TestB
My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42> My/TypeParamTest/2\. # TypeParam = .*MyArray<bool,\s*42>
@@ -122,7 +123,6 @@ def Run(args):
# The unit test. # The unit test.
class GTestListTestsUnitTest(gtest_test_utils.TestCase): class GTestListTestsUnitTest(gtest_test_utils.TestCase):
"""Tests using the --gtest_list_tests flag to list all tests.""" """Tests using the --gtest_list_tests flag to list all tests."""

2
googletest/test/gtest_test_utils.py
View File

@@ -145,8 +145,6 @@ atexit.register(_RemoveTempDir)
def GetTempDir(): def GetTempDir():
"""Returns a directory for temporary files."""
global _temp_dir global _temp_dir
if not _temp_dir: if not _temp_dir:
_temp_dir = tempfile.mkdtemp() _temp_dir = tempfile.mkdtemp()