diff options
| author | kosak <kosak@google.com> | 2014-01-13 22:24:15 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-01-13 22:24:15 +0000 |
| commit | 7d1051ce2b3be67d27b200d0050a7ec88c18621b (patch) | |
| tree | ed5e3c915538976af74959e032815c687ef332d4 /test | |
| parent | 6576c64903765304ac42767cdbbc3824446550b0 (diff) | |
| download | googletest-7d1051ce2b3be67d27b200d0050a7ec88c18621b.tar.gz googletest-7d1051ce2b3be67d27b200d0050a7ec88c18621b.tar.bz2 googletest-7d1051ce2b3be67d27b200d0050a7ec88c18621b.zip | |
Make Google Test build cleanly on Visual Studio 2010, 2012, 2013.
Also improve an error message in gtest_test_utils.py.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest-typed-test_test.cc | 3 | ||||
| -rwxr-xr-x | test/gtest_test_utils.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/gtest-typed-test_test.cc b/test/gtest-typed-test_test.cc index dd4ba43b..c3e66c2d 100644 --- a/test/gtest-typed-test_test.cc +++ b/test/gtest-typed-test_test.cc @@ -29,10 +29,11 @@ // // Author: wan@google.com (Zhanyong Wan) +#include "test/gtest-typed-test_test.h" + #include <set> #include <vector> -#include "test/gtest-typed-test_test.h" #include "gtest/gtest.h" using testing::Test; diff --git a/test/gtest_test_utils.py b/test/gtest_test_utils.py index 28884bdc..7e3cbcaf 100755 --- a/test/gtest_test_utils.py +++ b/test/gtest_test_utils.py @@ -175,9 +175,9 @@ def GetTestExecutablePath(executable_name, build_dir=None): if not os.path.exists(path): message = ( - 'Unable to find the test binary. Please make sure to provide path\n' - 'to the binary via the --build_dir flag or the BUILD_DIR\n' - 'environment variable.') + 'Unable to find the test binary "%s". Please make sure to provide\n' + 'a path to the binary via the --build_dir flag or the BUILD_DIR\n' + 'environment variable.' % path) print >> sys.stderr, message sys.exit(1) |