diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-07-22 02:16:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-07-22 02:16:37 +0000 |
| commit | 16b9431ae01d83de80db7ef3e411d9771ee845e4 (patch) | |
| tree | f3f577a111e7b489673c0a48be6c5264bef3e1f2 /run_tests.py | |
| parent | c214ebc830aa918d54e535c6caa2da6317877e12 (diff) | |
| download | googletest-16b9431ae01d83de80db7ef3e411d9771ee845e4.tar.gz googletest-16b9431ae01d83de80db7ef3e411d9771ee845e4.tar.bz2 googletest-16b9431ae01d83de80db7ef3e411d9771ee845e4.zip | |
Makes gtest compile clean with gcc -Wall -Werror (by Zhanyong Wan); refactors scons script (by Vlad Losev).
Diffstat (limited to 'run_tests.py')
| -rwxr-xr-x | run_tests.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/run_tests.py b/run_tests.py index 727ecca5..67014f3b 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/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/ + <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/ On Mac: - <gtest root>/scons/build/mac-dbg/gtest/scons/ - <gtest root>/scons/build/mac-opt/gtest/scons/ + <gtest root>/scons/build/mac-dbg/scons/ + <gtest root>/scons/build/mac-opt/scons/ On other platforms: - <gtest root>/scons/build/dbg/gtest/scons/ - <gtest root>/scons/build/opt/gtest/scons/ + <gtest root>/scons/build/dbg/scons/ + <gtest root>/scons/build/opt/scons/ AUTHOR Written by Zhanyong Wan (wan@google.com) @@ -177,8 +177,7 @@ 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/gtest/scons' % config)) + self.os.path.join(self.script_dir, 'scons/build', config, 'scons')) def Run(self, args): """Runs the executable with given args (args[0] is the executable name). |