summaryrefslogtreecommitdiffstats
path: root/googletest/test
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-22 19:43:51 (GMT)
committerGennadiy Civil <misterg@google.com>2018-01-22 19:43:51 (GMT)
commit9bc86661f86a5c946f9e0a29ea2e34c8a9897d6b (patch)
tree0239515d01b88be4e4421372169d48a5ceb493e9 /googletest/test
parenta0435a54ce837595426c213dfdc8e951201371ee (diff)
downloadgoogletest-9bc86661f86a5c946f9e0a29ea2e34c8a9897d6b.zip
googletest-9bc86661f86a5c946f9e0a29ea2e34c8a9897d6b.tar.gz
googletest-9bc86661f86a5c946f9e0a29ea2e34c8a9897d6b.tar.bz2
Diffstat (limited to 'googletest/test')
-rwxr-xr-xgoogletest/test/gtest_list_tests_unittest.py8
-rwxr-xr-xgoogletest/test/gtest_test_utils.py2
2 files changed, 4 insertions, 6 deletions
diff --git a/googletest/test/gtest_list_tests_unittest.py b/googletest/test/gtest_list_tests_unittest.py
index 0844f98..f2d2fd1 100755
--- a/googletest/test/gtest_list_tests_unittest.py
+++ b/googletest/test/gtest_list_tests_unittest.py
@@ -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."""
diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py
index db06f2e..7c48933 100755
--- a/googletest/test/gtest_test_utils.py
+++ b/googletest/test/gtest_test_utils.py
@@ -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()