diff options
author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-07-21 22:21:07 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-07-21 22:21:07 +0000 |
commit | d60c5f41c2842effec130a9b0483b92dbbed6e55 (patch) | |
tree | 3bf31ed2132e714664090c70f631205ad185c215 /test/gmock-generated-matchers_test.cc | |
parent | e3bd0981ca06e682bcd03659286d7a3267c4d999 (diff) | |
download | googletest-d60c5f41c2842effec130a9b0483b92dbbed6e55.tar.gz googletest-d60c5f41c2842effec130a9b0483b92dbbed6e55.tar.bz2 googletest-d60c5f41c2842effec130a9b0483b92dbbed6e55.zip |
Removes unused scons scripts; picks up gtest r446.
Diffstat (limited to 'test/gmock-generated-matchers_test.cc')
-rw-r--r-- | test/gmock-generated-matchers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gmock-generated-matchers_test.cc b/test/gmock-generated-matchers_test.cc index 3a028040..600783c7 100644 --- a/test/gmock-generated-matchers_test.cc +++ b/test/gmock-generated-matchers_test.cc @@ -243,7 +243,7 @@ Matcher<tuple<char, int> > LessThan() { TEST(ArgsTest, ExplainsMatchResultWithInnerExplanation) { const Matcher<tuple<char, int, int> > m = Args<0, 2>(LessThan()); - EXPECT_EQ("whose fields (#0, #2) are ('a' (97), 42), " + EXPECT_EQ("whose fields (#0, #2) are ('a' (97, 0x61), 42), " "where the first value is 55 more than the second", Explain(m, make_tuple('a', 42, 42))); EXPECT_EQ("whose fields (#0, #2) are ('\\0', 43)", |