merges
This commit is contained in:
@@ -34,7 +34,6 @@ __author__ = 'wan@google.com (Zhanyong Wan)'
|
||||
import os
|
||||
import sys
|
||||
|
||||
|
||||
# Determines path to gtest_test_utils and imports it.
|
||||
SCRIPT_DIR = os.path.dirname(__file__) or '.'
|
||||
|
||||
@@ -44,9 +43,10 @@ if os.path.isdir(gtest_tests_util_dir):
|
||||
GTEST_TESTS_UTIL_DIR = gtest_tests_util_dir
|
||||
else:
|
||||
GTEST_TESTS_UTIL_DIR = os.path.join(SCRIPT_DIR, '../../googletest/test')
|
||||
|
||||
sys.path.append(GTEST_TESTS_UTIL_DIR)
|
||||
import gtest_test_utils # pylint: disable-msg=C6204
|
||||
|
||||
# pylint: disable=C6204
|
||||
import gtest_test_utils
|
||||
|
||||
|
||||
def GetSourceDir():
|
||||
|
Reference in New Issue
Block a user