aboutsummaryrefslogtreecommitdiffstats
path: root/test/run_tests_test.py
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-11-13 02:54:23 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-11-13 02:54:23 +0000
commitbcf926ec656688d7eb03159faaddbf56bd4ec8e2 (patch)
treecec29bb0b412c73dd0d5c192e9f2357e70493f02 /test/run_tests_test.py
parent7e13e0f5dd2f9458e0a613e0a91c894eb80126fc (diff)
downloadgoogletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.gz
googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.bz2
googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.zip
Improves the scons scripts and run_tests.py (by Vlad Losev); uses typed tests in gtest-port_test.cc only when typed tests are available (by Zhanyong Wan); makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan).
Diffstat (limited to 'test/run_tests_test.py')
-rwxr-xr-xtest/run_tests_test.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/run_tests_test.py b/test/run_tests_test.py
index 79524a68..a9f0b5db 100755
--- a/test/run_tests_test.py
+++ b/test/run_tests_test.py
@@ -42,9 +42,9 @@ sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), os.pardir))
import run_tests
-GTEST_DBG_DIR = 'scons/build/dbg/scons'
-GTEST_OPT_DIR = 'scons/build/opt/scons'
-GTEST_OTHER_DIR = 'scons/build/other/scons'
+GTEST_DBG_DIR = 'scons/build/dbg/gtest/scons'
+GTEST_OPT_DIR = 'scons/build/opt/gtest/scons'
+GTEST_OTHER_DIR = 'scons/build/other/gtest/scons'
def AddExeExtension(path):