diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-14 15:47:13 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-14 15:47:13 (GMT) |
commit | 2421eff9f780729b14b1d0132bb037e36c7c0e2e (patch) | |
tree | ce6e90c822efe2fb0e8262caf950a748525832b0 /googletest/test | |
parent | 24786cb498231a441fc8f50400272b8868d3610d (diff) | |
parent | 17714d65e158713c418da7b8de6ea9a6875edd1e (diff) | |
download | googletest-2421eff9f780729b14b1d0132bb037e36c7c0e2e.zip googletest-2421eff9f780729b14b1d0132bb037e36c7c0e2e.tar.gz googletest-2421eff9f780729b14b1d0132bb037e36c7c0e2e.tar.bz2 |
Merge branch 'master' into deprecaterefs/pull/1665/head
Diffstat (limited to 'googletest/test')
-rwxr-xr-x | googletest/test/googletest-output-test.py | 11 | ||||
-rw-r--r-- | googletest/test/googletest-printers-test.cc | 2 | ||||
-rwxr-xr-x | googletest/test/gtest_test_utils.py | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | googletest/test/gtest_testbridge_test.py | 0 |
4 files changed, 8 insertions, 13 deletions
diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py index c1c3652..0dae8d1 100755 --- a/googletest/test/googletest-output-test.py +++ b/googletest/test/googletest-output-test.py @@ -31,12 +31,11 @@ """Tests the text output of Google C++ Testing and Mocking Framework. - -SYNOPSIS - googletest_output_test.py --build_dir=BUILD/DIR --gengolden - # where BUILD/DIR contains the built googletest-output-test_ file. - googletest_output_test.py --gengolden - googletest_output_test.py +To update the golden file: +googletest_output_test.py --build_dir=BUILD/DIR --gengolden +where BUILD/DIR contains the built googletest-output-test_ file. +googletest_output_test.py --gengolden +googletest_output_test.py """ __author__ = 'wan@google.com (Zhanyong Wan)' diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc index 4018863..e4bb0c2 100644 --- a/googletest/test/googletest-printers-test.cc +++ b/googletest/test/googletest-printers-test.cc @@ -919,8 +919,6 @@ TEST(PrintStlContainerTest, MultiSet) { } #if GTEST_HAS_STD_FORWARD_LIST_ -// <slist> is available on Linux in the google3 mode, but not on -// Windows or Mac OS X. TEST(PrintStlContainerTest, SinglyLinkedList) { int a[] = { 9, 2, 8 }; diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py index d7fc099..c4c0227 100755 --- a/googletest/test/gtest_test_utils.py +++ b/googletest/test/gtest_test_utils.py @@ -36,15 +36,13 @@ __author__ = 'wan@google.com (Zhanyong Wan)' import os import sys -IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' IS_WINDOWS = os.name == 'nt' IS_CYGWIN = os.name == 'posix' and 'CYGWIN' in os.uname()[0] import atexit import shutil import tempfile -import unittest -_test_module = unittest +import unittest as _test_module try: import subprocess @@ -74,7 +72,7 @@ def SetEnvVar(env_var, value): # Here we expose a class from a particular module, depending on the # environment. The comment suppresses the 'Invalid variable name' lint # complaint. -TestCase = _test_module.TestCase # pylint: disable-msg=C6409 +TestCase = _test_module.TestCase # pylint: disable=C6409 # Initially maps a flag to its default value. After # _ParseAndStripGTestFlags() is called, maps a flag to its actual value. @@ -88,7 +86,7 @@ def _ParseAndStripGTestFlags(argv): # Suppresses the lint complaint about a global variable since we need it # here to maintain module-wide state. - global _gtest_flags_are_parsed # pylint: disable-msg=W0603 + global _gtest_flags_are_parsed # pylint: disable=W0603 if _gtest_flags_are_parsed: return diff --git a/googletest/test/gtest_testbridge_test.py b/googletest/test/gtest_testbridge_test.py index 2075e12..2075e12 100644..100755 --- a/googletest/test/gtest_testbridge_test.py +++ b/googletest/test/gtest_testbridge_test.py |