diff options
| -rw-r--r-- | cmake/internal_utils.cmake | 12 | ||||
| -rwxr-xr-x | test/gtest_help_test.py | 2 | ||||
| -rwxr-xr-x | test/gtest_output_test.py | 2 | ||||
| -rwxr-xr-x | test/gtest_test_utils.py | 10 | ||||
| -rwxr-xr-x | test/run_tests_util.py | 2 |
5 files changed, 16 insertions, 12 deletions
diff --git a/cmake/internal_utils.cmake b/cmake/internal_utils.cmake index dea8e16b..c611025e 100644 --- a/cmake/internal_utils.cmake +++ b/cmake/internal_utils.cmake @@ -1,3 +1,7 @@ +# NOTE: This file can be included both into Google Test's and Google Mock's +# build scripts, so actions and functions defined here need to be +# idempotent. + # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT. find_package(Threads) @@ -174,13 +178,13 @@ endfunction() function(py_test name) # We are not supporting Python tests on Linux yet as they consider # all Linux environments to be google3 and try to use google3 features. - if (PYTHONINTERP_FOUND AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - # ${gtest_BINARY_DIR} is known at configuration time, so we can + if (PYTHONINTERP_FOUND) + # ${CMAKE_BINARY_DIR} is known at configuration time, so we can # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known # only at ctest runtime (by calling ctest -c <Configuration>), so # we have to escape $ to delay variable substitution here. add_test(${name} - ${PYTHON_EXECUTABLE} ${gtest_SOURCE_DIR}/test/${name}.py - --gtest_build_dir=${gtest_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) + ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/${name}.py + --build_dir=${CMAKE_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) endif() endfunction() diff --git a/test/gtest_help_test.py b/test/gtest_help_test.py index 3cb4c48e..dc67ed3d 100755 --- a/test/gtest_help_test.py +++ b/test/gtest_help_test.py @@ -32,7 +32,7 @@ """Tests the --help flag of Google C++ Testing Framework. SYNOPSIS - gtest_help_test.py --gtest_build_dir=BUILD/DIR + gtest_help_test.py --build_dir=BUILD/DIR # where BUILD/DIR contains the built gtest_help_test_ file. gtest_help_test.py """ diff --git a/test/gtest_output_test.py b/test/gtest_output_test.py index 192030a2..dca4af04 100755 --- a/test/gtest_output_test.py +++ b/test/gtest_output_test.py @@ -32,7 +32,7 @@ """Tests the text output of Google C++ Testing Framework. SYNOPSIS - gtest_output_test.py --gtest_build_dir=BUILD/DIR --gengolden + gtest_output_test.py --build_dir=BUILD/DIR --gengolden # where BUILD/DIR contains the built gtest_output_test_ file. gtest_output_test.py --gengolden gtest_output_test.py diff --git a/test/gtest_test_utils.py b/test/gtest_test_utils.py index e0f5973e..e7ee9d9c 100755 --- a/test/gtest_test_utils.py +++ b/test/gtest_test_utils.py @@ -63,8 +63,8 @@ TestCase = _test_module.TestCase # pylint: disable-msg=C6409 # Initially maps a flag to its default value. After # _ParseAndStripGTestFlags() is called, maps a flag to its actual value. -_flag_map = {'gtest_source_dir': os.path.dirname(sys.argv[0]), - 'gtest_build_dir': os.path.dirname(sys.argv[0])} +_flag_map = {'source_dir': os.path.dirname(sys.argv[0]), + 'build_dir': os.path.dirname(sys.argv[0])} _gtest_flags_are_parsed = False @@ -111,13 +111,13 @@ def GetFlag(flag): def GetSourceDir(): """Returns the absolute path of the directory where the .py files are.""" - return os.path.abspath(GetFlag('gtest_source_dir')) + return os.path.abspath(GetFlag('source_dir')) def GetBuildDir(): """Returns the absolute path of the directory where the test binaries are.""" - return os.path.abspath(GetFlag('gtest_build_dir')) + return os.path.abspath(GetFlag('build_dir')) _temp_dir = None @@ -161,7 +161,7 @@ def GetTestExecutablePath(executable_name, build_dir=None): if not os.path.exists(path): message = ( 'Unable to find the test binary. Please make sure to provide path\n' - 'to the binary via the --gtest_build_dir flag or the GTEST_BUILD_DIR\n' + 'to the binary via the --build_dir flag or the BUILD_DIR\n' 'environment variable. For convenient use, invoke this script via\n' 'mk_test.py.\n' # TODO(vladl@google.com): change mk_test.py to test.py after renaming diff --git a/test/run_tests_util.py b/test/run_tests_util.py index 9e57931e..a123569e 100755 --- a/test/run_tests_util.py +++ b/test/run_tests_util.py @@ -171,7 +171,7 @@ class TestRunner(object): def __init__(self, script_dir, - build_dir_var_name='GTEST_BUILD_DIR', + build_dir_var_name='BUILD_DIR', injected_os=os, injected_subprocess=subprocess, injected_build_dir_finder=_GetGtestBuildDir): |