aboutsummaryrefslogtreecommitdiffstats
path: root/run_tests.py
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-07-16 00:36:55 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-07-16 00:36:55 +0000
commitc214ebc830aa918d54e535c6caa2da6317877e12 (patch)
treef8b2283ea725ae5686723c331341f7f20e375153 /run_tests.py
parent3a47ddf8ea888b4e5fe06bf79ef03a1456274f00 (diff)
downloadgoogletest-c214ebc830aa918d54e535c6caa2da6317877e12.tar.gz
googletest-c214ebc830aa918d54e535c6caa2da6317877e12.tar.bz2
googletest-c214ebc830aa918d54e535c6caa2da6317877e12.zip
More refactoring for the event listener API, by Vlad Losev.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/run_tests.py b/run_tests.py
index e558c155..727ecca5 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -98,16 +98,16 @@ KNOWN BUILD DIRECTORIES
defines them as follows (the default build directory is the first one
listed in each group):
On Windows:
- <gtest root>/scons/build/win-dbg8/scons/
- <gtest root>/scons/build/win-opt8/scons/
- <gtest root>/scons/build/win-dbg/scons/
- <gtest root>/scons/build/win-opt/scons/
+ <gtest root>/scons/build/win-dbg8/gtest/scons/
+ <gtest root>/scons/build/win-opt8/gtest/scons/
+ <gtest root>/scons/build/win-dbg/gtest/scons/
+ <gtest root>/scons/build/win-opt/gtest/scons/
On Mac:
- <gtest root>/scons/build/mac-dbg/scons/
- <gtest root>/scons/build/mac-opt/scons/
+ <gtest root>/scons/build/mac-dbg/gtest/scons/
+ <gtest root>/scons/build/mac-opt/gtest/scons/
On other platforms:
- <gtest root>/scons/build/dbg/scons/
- <gtest root>/scons/build/opt/scons/
+ <gtest root>/scons/build/dbg/gtest/scons/
+ <gtest root>/scons/build/opt/gtest/scons/
AUTHOR
Written by Zhanyong Wan (wan@google.com)
@@ -177,7 +177,8 @@ class TestRunner(object):
"""Returns the build directory for a given configuration."""
return self.os.path.normpath(
- self.os.path.join(self.script_dir, 'scons/build/%s/scons' % config))
+ self.os.path.join(self.script_dir,
+ 'scons/build/%s/gtest/scons' % config))
def Run(self, args):
"""Runs the executable with given args (args[0] is the executable name).