diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-02-12 07:12:20 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-02-12 07:12:20 +0000 |
| commit | 0980b4bd66b496074d9e34d9f05244e700e9406d (patch) | |
| tree | ac443055980ad47b0989eac214761745e891d151 | |
| parent | 6642ca8cd46cf905b45e8f71532922df4d03800d (diff) | |
| download | googletest-0980b4bd66b496074d9e34d9f05244e700e9406d.tar.gz googletest-0980b4bd66b496074d9e34d9f05244e700e9406d.tar.bz2 googletest-0980b4bd66b496074d9e34d9f05244e700e9406d.zip | |
Fixes off-by-one error in a message about test sharding (by David Glasser).
| -rw-r--r-- | src/gtest.cc | 5 | ||||
| -rw-r--r-- | test/gtest_output_test_golden_lin.txt | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gtest.cc b/src/gtest.cc index 1c58c6fd..53a52fbf 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -2716,9 +2716,10 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart( } if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) { + const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1); ColoredPrintf(COLOR_YELLOW, - "Note: This is test shard %s of %s.\n", - internal::posix::GetEnv(kTestShardIndex), + "Note: This is test shard %d of %s.\n", + static_cast<int>(shard_index) + 1, internal::posix::GetEnv(kTestTotalShards)); } diff --git a/test/gtest_output_test_golden_lin.txt b/test/gtest_output_test_golden_lin.txt index 0ba9968c..a1d342d9 100644 --- a/test/gtest_output_test_golden_lin.txt +++ b/test/gtest_output_test_golden_lin.txt @@ -697,7 +697,7 @@ Note: Google Test filter = *DISABLED_* [==========] 1 test from 1 test case ran. [ PASSED ] 1 test. Note: Google Test filter = PassingTest.* -Note: This is test shard 1 of 2. +Note: This is test shard 2 of 2. [==========] Running 1 test from 1 test case. [----------] Global test environment set-up. [----------] 1 test from PassingTest |