more merging
This commit is contained in:
parent
a0435a54ce
commit
9bc86661f8
|
@ -39,8 +39,9 @@ Google Test) the command line flags.
|
|||
|
||||
__author__ = 'phanna@google.com (Patrick Hanna)'
|
||||
|
||||
import re
|
||||
import gtest_test_utils
|
||||
import re
|
||||
|
||||
|
||||
# Constants.
|
||||
|
||||
|
@ -70,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>
|
||||
|
@ -79,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>
|
||||
|
@ -122,7 +123,6 @@ def Run(args):
|
|||
|
||||
# The unit test.
|
||||
|
||||
|
||||
class GTestListTestsUnitTest(gtest_test_utils.TestCase):
|
||||
"""Tests using the --gtest_list_tests flag to list all tests."""
|
||||
|
||||
|
|
|
@ -145,8 +145,6 @@ atexit.register(_RemoveTempDir)
|
|||
|
||||
|
||||
def GetTempDir():
|
||||
"""Returns a directory for temporary files."""
|
||||
|
||||
global _temp_dir
|
||||
if not _temp_dir:
|
||||
_temp_dir = tempfile.mkdtemp()
|
||||
|
|
Loading…
Reference in New Issue
Block a user