diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-13 02:54:23 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-13 02:54:23 (GMT) |
| commit | bcf926ec656688d7eb03159faaddbf56bd4ec8e2 (patch) | |
| tree | cec29bb0b412c73dd0d5c192e9f2357e70493f02 /run_tests.py | |
| parent | 7e13e0f5dd2f9458e0a613e0a91c894eb80126fc (diff) | |
| download | googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.zip googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.gz googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.bz2 | |
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 'run_tests.py')
| -rwxr-xr-x | run_tests.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/run_tests.py b/run_tests.py index 67014f3..6f11bc2 100755 --- a/run_tests.py +++ b/run_tests.py @@ -50,7 +50,7 @@ OPTIONS Specify build directories via build configurations. CONFIGURATIONS is either a comma-separated list of build configurations or 'all'. Each configuration is equivalent to - adding 'scons/build/<configuration>/scons' to BUILD_DIRs. + adding 'scons/build/<configuration>/gtest/scons' to BUILD_DIRs. Specifying -c=all is equivalent to providing all directories listed in KNOWN BUILD DIRECTORIES section below. @@ -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,10 @@ 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', config, 'scons')) + self.os.path.join(self.script_dir, + 'scons/build', + config, + 'gtest/scons')) def Run(self, args): """Runs the executable with given args (args[0] is the executable name). |