Bump to gtest 1.10.0
[platform/upstream/gtest.git] / googletest / test / googletest-output-test-golden-lin.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 56%
rename from test/gtest_output_test_golden_lin.txt
rename to googletest/test/googletest-output-test-golden-lin.txt
index 2223d56..038de92
@@ -1,13 +1,18 @@
 The non-test part of the code is expected to have 2 failures.
 
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Value of: false
   Actual: false
 Expected: true
-gtest_output_test_.cc:#: Failure
-      Expected: 2
-To be equal to: 3
-\e[0;32m[==========] \e[mRunning 66 tests from 29 test cases.
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  2
+  3
+Stack trace: (omitted)
+
+\e[0;32m[==========] \e[mRunning 85 tests from 40 test suites.
 \e[0;32m[----------] \e[mGlobal test environment set-up.
 FooEnvironment::SetUp() called.
 BarEnvironment::SetUp() called.
@@ -33,292 +38,422 @@ BarEnvironment::SetUp() called.
 \e[0;32m[       OK ] \e[mPassingTest.PassingTest2
 \e[0;32m[----------] \e[m2 tests from NonfatalFailureTest
 \e[0;32m[ RUN      ] \e[mNonfatalFailureTest.EscapesStringOperands
-gtest_output_test_.cc:#: Failure
-      Expected: kGoldenString
-      Which is: "\"Line"
-To be equal to: actual
-      Which is: "actual \"string\""
-gtest_output_test_.cc:#: Failure
-      Expected: golden
-      Which is: "\"Line"
-To be equal to: actual
-      Which is: "actual \"string\""
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  kGoldenString
+    Which is: "\"Line"
+  actual
+    Which is: "actual \"string\""
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  golden
+    Which is: "\"Line"
+  actual
+    Which is: "actual \"string\""
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mNonfatalFailureTest.EscapesStringOperands
 \e[0;32m[ RUN      ] \e[mNonfatalFailureTest.DiffForLongStrings
-gtest_output_test_.cc:#: Failure
-      Expected: golden_str
-      Which is: "\"Line\0 1\"\nLine 2"
-To be equal to: "Line 2"
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  golden_str
+    Which is: "\"Line\0 1\"\nLine 2"
+  "Line 2"
 With diff:
 @@ -1,2 @@
 -\"Line\0 1\"
  Line 2
 
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mNonfatalFailureTest.DiffForLongStrings
 \e[0;32m[----------] \e[m3 tests from FatalFailureTest
 \e[0;32m[ RUN      ] \e[mFatalFailureTest.FatalFailureInSubroutine
 (expecting a failure that x should be 1)
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: x
-      Which is: 2
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  x
+    Which is: 2
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mFatalFailureTest.FatalFailureInSubroutine
 \e[0;32m[ RUN      ] \e[mFatalFailureTest.FatalFailureInNestedSubroutine
 (expecting a failure that x should be 1)
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: x
-      Which is: 2
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  x
+    Which is: 2
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mFatalFailureTest.FatalFailureInNestedSubroutine
 \e[0;32m[ RUN      ] \e[mFatalFailureTest.NonfatalFailureInSubroutine
 (expecting a failure on false)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Value of: false
   Actual: false
 Expected: true
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mFatalFailureTest.NonfatalFailureInSubroutine
 \e[0;32m[----------] \e[m1 test from LoggingTest
 \e[0;32m[ RUN      ] \e[mLoggingTest.InterleavingLoggingAndAssertions
 (expecting 2 failures on (3) >= (a[i]))
 i == 0
 i == 1
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Expected: (3) >= (a[i]), actual: 3 vs 9
+Stack trace: (omitted)
+
 i == 2
 i == 3
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Expected: (3) >= (a[i]), actual: 3 vs 6
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mLoggingTest.InterleavingLoggingAndAssertions
-\e[0;32m[----------] \e[m6 tests from SCOPED_TRACETest
+\e[0;32m[----------] \e[m7 tests from SCOPED_TRACETest
+\e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.AcceptedValues
+googletest-output-test_.cc:#: Failure
+Failed
+Just checking that all these values work fine.
+Google Test trace:
+googletest-output-test_.cc:#: (null)
+googletest-output-test_.cc:#: 1337
+googletest-output-test_.cc:#: std::string
+googletest-output-test_.cc:#: literal string
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.AcceptedValues
 \e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.ObeysScopes
 (expected to fail)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and shouldn't have a trace.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and should have a trace.
 Google Test trace:
-gtest_output_test_.cc:#: Expected trace
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Expected trace
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and shouldn't have a trace.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.ObeysScopes
 \e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.WorksInLoop
 (expected to fail)
-gtest_output_test_.cc:#: Failure
-      Expected: 2
-To be equal to: n
-      Which is: 1
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  2
+  n
+    Which is: 1
 Google Test trace:
-gtest_output_test_.cc:#: i = 1
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: n
-      Which is: 2
+googletest-output-test_.cc:#: i = 1
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  n
+    Which is: 2
 Google Test trace:
-gtest_output_test_.cc:#: i = 2
+googletest-output-test_.cc:#: i = 2
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.WorksInLoop
 \e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.WorksInSubroutine
 (expected to fail)
-gtest_output_test_.cc:#: Failure
-      Expected: 2
-To be equal to: n
-      Which is: 1
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  2
+  n
+    Which is: 1
 Google Test trace:
-gtest_output_test_.cc:#: n = 1
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: n
-      Which is: 2
+googletest-output-test_.cc:#: n = 1
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  n
+    Which is: 2
 Google Test trace:
-gtest_output_test_.cc:#: n = 2
+googletest-output-test_.cc:#: n = 2
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.WorksInSubroutine
 \e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.CanBeNested
 (expected to fail)
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: n
-      Which is: 2
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  n
+    Which is: 2
 Google Test trace:
-gtest_output_test_.cc:#: n = 2
-gtest_output_test_.cc:#: 
+googletest-output-test_.cc:#: n = 2
+googletest-output-test_.cc:#: 
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.CanBeNested
 \e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.CanBeRepeated
 (expected to fail)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and should contain trace point A.
 Google Test trace:
-gtest_output_test_.cc:#: A
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: A
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and should contain trace point A and B.
 Google Test trace:
-gtest_output_test_.cc:#: B
-gtest_output_test_.cc:#: A
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: B
+googletest-output-test_.cc:#: A
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and should contain trace point A, B, and C.
 Google Test trace:
-gtest_output_test_.cc:#: C
-gtest_output_test_.cc:#: B
-gtest_output_test_.cc:#: A
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: C
+googletest-output-test_.cc:#: B
+googletest-output-test_.cc:#: A
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 This failure is expected, and should contain trace point A, B, and D.
 Google Test trace:
-gtest_output_test_.cc:#: D
-gtest_output_test_.cc:#: B
-gtest_output_test_.cc:#: A
+googletest-output-test_.cc:#: D
+googletest-output-test_.cc:#: B
+googletest-output-test_.cc:#: A
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.CanBeRepeated
 \e[0;32m[ RUN      ] \e[mSCOPED_TRACETest.WorksConcurrently
 (expecting 6 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #1 (in thread B, only trace B alive).
 Google Test trace:
-gtest_output_test_.cc:#: Trace B
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Trace B
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #2 (in thread A, trace A & B both alive).
 Google Test trace:
-gtest_output_test_.cc:#: Trace A
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Trace A
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #3 (in thread B, trace A & B both alive).
 Google Test trace:
-gtest_output_test_.cc:#: Trace B
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Trace B
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #4 (in thread B, only trace A alive).
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #5 (in thread A, only trace A alive).
 Google Test trace:
-gtest_output_test_.cc:#: Trace A
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Trace A
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #6 (in thread A, no trace alive).
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.WorksConcurrently
+\e[0;32m[----------] \e[m1 test from ScopedTraceTest
+\e[0;32m[ RUN      ] \e[mScopedTraceTest.WithExplicitFileAndLine
+googletest-output-test_.cc:#: Failure
+Failed
+Check that the trace is attached to a particular location.
+Google Test trace:
+explicit_file.cc:123: expected trace message
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mScopedTraceTest.WithExplicitFileAndLine
 \e[0;32m[----------] \e[m1 test from NonFatalFailureInFixtureConstructorTest
 \e[0;32m[ RUN      ] \e[mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
 (expecting 5 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #1, in the test fixture c'tor.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #2, in SetUp().
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #3, in the test body.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #4, in TearDown.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #5, in the test fixture d'tor.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
 \e[0;32m[----------] \e[m1 test from FatalFailureInFixtureConstructorTest
 \e[0;32m[ RUN      ] \e[mFatalFailureInFixtureConstructorTest.FailureInConstructor
 (expecting 2 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #1, in the test fixture c'tor.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #2, in the test fixture d'tor.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mFatalFailureInFixtureConstructorTest.FailureInConstructor
 \e[0;32m[----------] \e[m1 test from NonFatalFailureInSetUpTest
 \e[0;32m[ RUN      ] \e[mNonFatalFailureInSetUpTest.FailureInSetUp
 (expecting 4 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #1, in SetUp().
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #2, in the test function.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #3, in TearDown().
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #4, in the test fixture d'tor.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mNonFatalFailureInSetUpTest.FailureInSetUp
 \e[0;32m[----------] \e[m1 test from FatalFailureInSetUpTest
 \e[0;32m[ RUN      ] \e[mFatalFailureInSetUpTest.FailureInSetUp
 (expecting 3 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #1, in SetUp().
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #2, in TearDown().
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected failure #3, in the test fixture d'tor.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mFatalFailureInSetUpTest.FailureInSetUp
 \e[0;32m[----------] \e[m1 test from AddFailureAtTest
 \e[0;32m[ RUN      ] \e[mAddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
 foo.cc:42: Failure
 Failed
-Expected failure in foo.cc
+Expected nonfatal failure in foo.cc
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mAddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
-\e[0;32m[----------] \e[m4 tests from MixedUpTestCaseTest
-\e[0;32m[ RUN      ] \e[mMixedUpTestCaseTest.FirstTestFromNamespaceFoo
-\e[0;32m[       OK ] \e[mMixedUpTestCaseTest.FirstTestFromNamespaceFoo
-\e[0;32m[ RUN      ] \e[mMixedUpTestCaseTest.SecondTestFromNamespaceFoo
-\e[0;32m[       OK ] \e[mMixedUpTestCaseTest.SecondTestFromNamespaceFoo
-\e[0;32m[ RUN      ] \e[mMixedUpTestCaseTest.ThisShouldFail
+\e[0;32m[----------] \e[m1 test from GtestFailAtTest
+\e[0;32m[ RUN      ] \e[mGtestFailAtTest.MessageContainsSpecifiedFileAndLineNumber
+foo.cc:42: Failure
+Failed
+Expected fatal failure in foo.cc
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mGtestFailAtTest.MessageContainsSpecifiedFileAndLineNumber
+\e[0;32m[----------] \e[m4 tests from MixedUpTestSuiteTest
+\e[0;32m[ RUN      ] \e[mMixedUpTestSuiteTest.FirstTestFromNamespaceFoo
+\e[0;32m[       OK ] \e[mMixedUpTestSuiteTest.FirstTestFromNamespaceFoo
+\e[0;32m[ RUN      ] \e[mMixedUpTestSuiteTest.SecondTestFromNamespaceFoo
+\e[0;32m[       OK ] \e[mMixedUpTestSuiteTest.SecondTestFromNamespaceFoo
+\e[0;32m[ RUN      ] \e[mMixedUpTestSuiteTest.ThisShouldFail
 gtest.cc:#: Failure
 Failed
-All tests in the same test case must use the same test fixture
-class.  However, in test case MixedUpTestCaseTest,
+All tests in the same test suite must use the same test fixture
+class.  However, in test suite MixedUpTestSuiteTest,
 you defined test FirstTestFromNamespaceFoo and test ThisShouldFail
 using two different test fixture classes.  This can happen if
 the two classes are from different namespaces or translation
 units and have the same name.  You should probably rename one
-of the classes to put the tests into different test cases.
-\e[0;31m[  FAILED  ] \e[mMixedUpTestCaseTest.ThisShouldFail
-\e[0;32m[ RUN      ] \e[mMixedUpTestCaseTest.ThisShouldFailToo
+of the classes to put the tests into different test suites.
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mMixedUpTestSuiteTest.ThisShouldFail
+\e[0;32m[ RUN      ] \e[mMixedUpTestSuiteTest.ThisShouldFailToo
 gtest.cc:#: Failure
 Failed
-All tests in the same test case must use the same test fixture
-class.  However, in test case MixedUpTestCaseTest,
+All tests in the same test suite must use the same test fixture
+class.  However, in test suite MixedUpTestSuiteTest,
 you defined test FirstTestFromNamespaceFoo and test ThisShouldFailToo
 using two different test fixture classes.  This can happen if
 the two classes are from different namespaces or translation
 units and have the same name.  You should probably rename one
-of the classes to put the tests into different test cases.
-\e[0;31m[  FAILED  ] \e[mMixedUpTestCaseTest.ThisShouldFailToo
-\e[0;32m[----------] \e[m2 tests from MixedUpTestCaseWithSameTestNameTest
-\e[0;32m[ RUN      ] \e[mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
-\e[0;32m[       OK ] \e[mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
-\e[0;32m[ RUN      ] \e[mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+of the classes to put the tests into different test suites.
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mMixedUpTestSuiteTest.ThisShouldFailToo
+\e[0;32m[----------] \e[m2 tests from MixedUpTestSuiteWithSameTestNameTest
+\e[0;32m[ RUN      ] \e[mMixedUpTestSuiteWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+\e[0;32m[       OK ] \e[mMixedUpTestSuiteWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+\e[0;32m[ RUN      ] \e[mMixedUpTestSuiteWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
 gtest.cc:#: Failure
 Failed
-All tests in the same test case must use the same test fixture
-class.  However, in test case MixedUpTestCaseWithSameTestNameTest,
+All tests in the same test suite must use the same test fixture
+class.  However, in test suite MixedUpTestSuiteWithSameTestNameTest,
 you defined test TheSecondTestWithThisNameShouldFail and test TheSecondTestWithThisNameShouldFail
 using two different test fixture classes.  This can happen if
 the two classes are from different namespaces or translation
 units and have the same name.  You should probably rename one
-of the classes to put the tests into different test cases.
-\e[0;31m[  FAILED  ] \e[mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+of the classes to put the tests into different test suites.
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mMixedUpTestSuiteWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
 \e[0;32m[----------] \e[m2 tests from TEST_F_before_TEST_in_same_test_case
 \e[0;32m[ RUN      ] \e[mTEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
 \e[0;32m[       OK ] \e[mTEST_F_before_TEST_in_same_test_case.DefinedUsingTEST_F
 \e[0;32m[ RUN      ] \e[mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
 gtest.cc:#: Failure
 Failed
-All tests in the same test case must use the same test fixture
-class, so mixing TEST_F and TEST in the same test case is
-illegal.  In test case TEST_F_before_TEST_in_same_test_case,
+All tests in the same test suite must use the same test fixture
+class, so mixing TEST_F and TEST in the same test suite is
+illegal.  In test suite TEST_F_before_TEST_in_same_test_case,
 test DefinedUsingTEST_F is defined using TEST_F but
 test DefinedUsingTESTAndShouldFail is defined using TEST.  You probably
 want to change the TEST to TEST_F or move it to another test
 case.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
 \e[0;32m[----------] \e[m2 tests from TEST_before_TEST_F_in_same_test_case
 \e[0;32m[ RUN      ] \e[mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST
@@ -326,13 +461,15 @@ case.
 \e[0;32m[ RUN      ] \e[mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
 gtest.cc:#: Failure
 Failed
-All tests in the same test case must use the same test fixture
-class, so mixing TEST_F and TEST in the same test case is
-illegal.  In test case TEST_before_TEST_F_in_same_test_case,
+All tests in the same test suite must use the same test fixture
+class, so mixing TEST_F and TEST in the same test suite is
+illegal.  In test suite TEST_before_TEST_F_in_same_test_case,
 test DefinedUsingTEST_FAndShouldFail is defined using TEST_F but
 test DefinedUsingTEST is defined using TEST.  You probably
 want to change the TEST to TEST_F or move it to another test
 case.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
 \e[0;32m[----------] \e[m8 tests from ExpectNonfatalFailureTest
 \e[0;32m[ RUN      ] \e[mExpectNonfatalFailureTest.CanReferenceGlobalVariables
@@ -346,19 +483,27 @@ case.
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
 \e[0;32m[ RUN      ] \e[mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
 (expecting a failure)
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual: 2 failures
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure 1.
+Stack trace: (omitted)
+
 
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure 2.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectNonfatalFailureTest.FailsWhenThereAreTwoNonfatalFailures
 \e[0;32m[ RUN      ] \e[mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
@@ -366,9 +511,13 @@ Expected non-fatal failure 2.
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual:
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectNonfatalFailureTest.FailsWhenThereIsOneFatalFailure
 \e[0;32m[ RUN      ] \e[mExpectNonfatalFailureTest.FailsWhenStatementReturns
@@ -376,12 +525,16 @@ Expected fatal failure.
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectNonfatalFailureTest.FailsWhenStatementReturns
 \e[0;32m[ RUN      ] \e[mExpectNonfatalFailureTest.FailsWhenStatementThrows
 (expecting a failure)
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectNonfatalFailureTest.FailsWhenStatementThrows
 \e[0;32m[----------] \e[m8 tests from ExpectFatalFailureTest
 \e[0;32m[ RUN      ] \e[mExpectFatalFailureTest.CanReferenceGlobalVariables
@@ -395,19 +548,27 @@ Expected: 1 non-fatal failure
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenThereIsNoFatalFailure
 \e[0;32m[ RUN      ] \e[mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
 (expecting a failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual: 2 failures
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
 
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenThereAreTwoFatalFailures
 \e[0;32m[ RUN      ] \e[mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
@@ -415,9 +576,13 @@ Expected fatal failure.
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual:
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenThereIsOneNonfatalFailure
 \e[0;32m[ RUN      ] \e[mExpectFatalFailureTest.FailsWhenStatementReturns
@@ -425,69 +590,140 @@ Expected non-fatal failure.
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenStatementReturns
 \e[0;32m[ RUN      ] \e[mExpectFatalFailureTest.FailsWhenStatementThrows
 (expecting a failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenStatementThrows
 \e[0;32m[----------] \e[m2 tests from TypedTest/0, where TypeParam = int
 \e[0;32m[ RUN      ] \e[mTypedTest/0.Success
 \e[0;32m[       OK ] \e[mTypedTest/0.Success
 \e[0;32m[ RUN      ] \e[mTypedTest/0.Failure
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: TypeParam()
-      Which is: 0
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  TypeParam()
+    Which is: 0
 Expected failure
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mTypedTest/0.Failure, where TypeParam = int
+\e[0;32m[----------] \e[m2 tests from TypedTestWithNames/char0, where TypeParam = char
+\e[0;32m[ RUN      ] \e[mTypedTestWithNames/char0.Success
+\e[0;32m[       OK ] \e[mTypedTestWithNames/char0.Success
+\e[0;32m[ RUN      ] \e[mTypedTestWithNames/char0.Failure
+googletest-output-test_.cc:#: Failure
+Failed
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mTypedTestWithNames/char0.Failure, where TypeParam = char
+\e[0;32m[----------] \e[m2 tests from TypedTestWithNames/int1, where TypeParam = int
+\e[0;32m[ RUN      ] \e[mTypedTestWithNames/int1.Success
+\e[0;32m[       OK ] \e[mTypedTestWithNames/int1.Success
+\e[0;32m[ RUN      ] \e[mTypedTestWithNames/int1.Failure
+googletest-output-test_.cc:#: Failure
+Failed
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mTypedTestWithNames/int1.Failure, where TypeParam = int
 \e[0;32m[----------] \e[m2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char
 \e[0;32m[ RUN      ] \e[mUnsigned/TypedTestP/0.Success
 \e[0;32m[       OK ] \e[mUnsigned/TypedTestP/0.Success
 \e[0;32m[ RUN      ] \e[mUnsigned/TypedTestP/0.Failure
-gtest_output_test_.cc:#: Failure
-      Expected: 1U
-      Which is: 1
-To be equal to: TypeParam()
-      Which is: '\0'
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1U
+    Which is: 1
+  TypeParam()
+    Which is: '\0'
 Expected failure
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mUnsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
 \e[0;32m[----------] \e[m2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int
 \e[0;32m[ RUN      ] \e[mUnsigned/TypedTestP/1.Success
 \e[0;32m[       OK ] \e[mUnsigned/TypedTestP/1.Success
 \e[0;32m[ RUN      ] \e[mUnsigned/TypedTestP/1.Failure
-gtest_output_test_.cc:#: Failure
-      Expected: 1U
-      Which is: 1
-To be equal to: TypeParam()
-      Which is: 0
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1U
+    Which is: 1
+  TypeParam()
+    Which is: 0
 Expected failure
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mUnsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
+\e[0;32m[----------] \e[m2 tests from UnsignedCustomName/TypedTestP/unsignedChar0, where TypeParam = unsigned char
+\e[0;32m[ RUN      ] \e[mUnsignedCustomName/TypedTestP/unsignedChar0.Success
+\e[0;32m[       OK ] \e[mUnsignedCustomName/TypedTestP/unsignedChar0.Success
+\e[0;32m[ RUN      ] \e[mUnsignedCustomName/TypedTestP/unsignedChar0.Failure
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1U
+    Which is: 1
+  TypeParam()
+    Which is: '\0'
+Expected failure
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mUnsignedCustomName/TypedTestP/unsignedChar0.Failure, where TypeParam = unsigned char
+\e[0;32m[----------] \e[m2 tests from UnsignedCustomName/TypedTestP/unsignedInt1, where TypeParam = unsigned int
+\e[0;32m[ RUN      ] \e[mUnsignedCustomName/TypedTestP/unsignedInt1.Success
+\e[0;32m[       OK ] \e[mUnsignedCustomName/TypedTestP/unsignedInt1.Success
+\e[0;32m[ RUN      ] \e[mUnsignedCustomName/TypedTestP/unsignedInt1.Failure
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1U
+    Which is: 1
+  TypeParam()
+    Which is: 0
+Expected failure
+Stack trace: (omitted)
+
+\e[0;31m[  FAILED  ] \e[mUnsignedCustomName/TypedTestP/unsignedInt1.Failure, where TypeParam = unsigned int
 \e[0;32m[----------] \e[m4 tests from ExpectFailureTest
 \e[0;32m[ RUN      ] \e[mExpectFailureTest.ExpectFatalFailure
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual:
-gtest_output_test_.cc:#: Success:
+googletest-output-test_.cc:#: Success:
 Succeeded
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual:
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure containing "Some other fatal failure expected."
   Actual:
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectFatalFailure
 \e[0;32m[ RUN      ] \e[mExpectFailureTest.ExpectNonFatalFailure
@@ -495,24 +731,36 @@ Expected fatal failure.
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual:
-gtest_output_test_.cc:#: Success:
+googletest-output-test_.cc:#: Success:
 Succeeded
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual:
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure containing "Some other non-fatal failure."
   Actual:
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectNonFatalFailure
 \e[0;32m[ RUN      ] \e[mExpectFailureTest.ExpectFatalFailureOnAllThreads
@@ -520,24 +768,36 @@ Expected non-fatal failure.
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual:
-gtest_output_test_.cc:#: Success:
+googletest-output-test_.cc:#: Success:
 Succeeded
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual:
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 fatal failure containing "Some other fatal failure expected."
   Actual:
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectFatalFailureOnAllThreads
 \e[0;32m[ RUN      ] \e[mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
@@ -545,104 +805,222 @@ Expected fatal failure.
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual:
-gtest_output_test_.cc:#: Success:
+googletest-output-test_.cc:#: Success:
 Succeeded
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual:
-gtest_output_test_.cc:#: Fatal failure:
+googletest-output-test_.cc:#: Fatal failure:
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 (expecting 1 failure)
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure containing "Some other non-fatal failure."
   Actual:
-gtest_output_test_.cc:#: Non-fatal failure:
+googletest-output-test_.cc:#: Non-fatal failure:
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
+
+Stack trace: (omitted)
 
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectNonFatalFailureOnAllThreads
 \e[0;32m[----------] \e[m2 tests from ExpectFailureWithThreadsTest
 \e[0;32m[ RUN      ] \e[mExpectFailureWithThreadsTest.ExpectFatalFailure
 (expecting 2 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected fatal failure.
+Stack trace: (omitted)
+
 gtest.cc:#: Failure
 Expected: 1 fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectFailureWithThreadsTest.ExpectFatalFailure
 \e[0;32m[ RUN      ] \e[mExpectFailureWithThreadsTest.ExpectNonFatalFailure
 (expecting 2 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
 gtest.cc:#: Failure
 Expected: 1 non-fatal failure
   Actual: 0 failures
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mExpectFailureWithThreadsTest.ExpectNonFatalFailure
 \e[0;32m[----------] \e[m1 test from ScopedFakeTestPartResultReporterTest
 \e[0;32m[ RUN      ] \e[mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
 (expecting 2 failures)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected fatal failure.
-gtest_output_test_.cc:#: Failure
+Stack trace: (omitted)
+
+googletest-output-test_.cc:#: Failure
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
+\e[0;32m[----------] \e[m2 tests from DynamicFixture
+DynamicFixture::SetUpTestSuite
+\e[0;32m[ RUN      ] \e[mDynamicFixture.DynamicTestPass
+DynamicFixture()
+DynamicFixture::SetUp
+DynamicFixture::TearDown
+~DynamicFixture()
+\e[0;32m[       OK ] \e[mDynamicFixture.DynamicTestPass
+\e[0;32m[ RUN      ] \e[mDynamicFixture.DynamicTestFail
+DynamicFixture()
+DynamicFixture::SetUp
+googletest-output-test_.cc:#: Failure
+Value of: Pass
+  Actual: false
+Expected: true
+Stack trace: (omitted)
+
+DynamicFixture::TearDown
+~DynamicFixture()
+\e[0;31m[  FAILED  ] \e[mDynamicFixture.DynamicTestFail
+DynamicFixture::TearDownTestSuite
+\e[0;32m[----------] \e[m1 test from DynamicFixtureAnotherName
+DynamicFixture::SetUpTestSuite
+\e[0;32m[ RUN      ] \e[mDynamicFixtureAnotherName.DynamicTestPass
+DynamicFixture()
+DynamicFixture::SetUp
+DynamicFixture::TearDown
+~DynamicFixture()
+\e[0;32m[       OK ] \e[mDynamicFixtureAnotherName.DynamicTestPass
+DynamicFixture::TearDownTestSuite
+\e[0;32m[----------] \e[m2 tests from BadDynamicFixture1
+DynamicFixture::SetUpTestSuite
+\e[0;32m[ RUN      ] \e[mBadDynamicFixture1.FixtureBase
+DynamicFixture()
+DynamicFixture::SetUp
+DynamicFixture::TearDown
+~DynamicFixture()
+\e[0;32m[       OK ] \e[mBadDynamicFixture1.FixtureBase
+\e[0;32m[ RUN      ] \e[mBadDynamicFixture1.TestBase
+DynamicFixture()
+gtest.cc:#: Failure
+Failed
+All tests in the same test suite must use the same test fixture
+class, so mixing TEST_F and TEST in the same test suite is
+illegal.  In test suite BadDynamicFixture1,
+test FixtureBase is defined using TEST_F but
+test TestBase is defined using TEST.  You probably
+want to change the TEST to TEST_F or move it to another test
+case.
+Stack trace: (omitted)
+
+~DynamicFixture()
+\e[0;31m[  FAILED  ] \e[mBadDynamicFixture1.TestBase
+DynamicFixture::TearDownTestSuite
+\e[0;32m[----------] \e[m2 tests from BadDynamicFixture2
+DynamicFixture::SetUpTestSuite
+\e[0;32m[ RUN      ] \e[mBadDynamicFixture2.FixtureBase
+DynamicFixture()
+DynamicFixture::SetUp
+DynamicFixture::TearDown
+~DynamicFixture()
+\e[0;32m[       OK ] \e[mBadDynamicFixture2.FixtureBase
+\e[0;32m[ RUN      ] \e[mBadDynamicFixture2.Derived
+DynamicFixture()
+gtest.cc:#: Failure
+Failed
+All tests in the same test suite must use the same test fixture
+class.  However, in test suite BadDynamicFixture2,
+you defined test FixtureBase and test Derived
+using two different test fixture classes.  This can happen if
+the two classes are from different namespaces or translation
+units and have the same name.  You should probably rename one
+of the classes to put the tests into different test suites.
+Stack trace: (omitted)
+
+~DynamicFixture()
+\e[0;31m[  FAILED  ] \e[mBadDynamicFixture2.Derived
+DynamicFixture::TearDownTestSuite
 \e[0;32m[----------] \e[m1 test from PrintingFailingParams/FailingParamTest
 \e[0;32m[ RUN      ] \e[mPrintingFailingParams/FailingParamTest.Fails/0
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: GetParam()
-      Which is: 2
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  GetParam()
+    Which is: 2
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mPrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
+\e[0;32m[----------] \e[m1 test from EmptyBasenameParamInst
+\e[0;32m[ RUN      ] \e[mEmptyBasenameParamInst.Passes/0
+\e[0;32m[       OK ] \e[mEmptyBasenameParamInst.Passes/0
 \e[0;32m[----------] \e[m2 tests from PrintingStrings/ParamTest
 \e[0;32m[ RUN      ] \e[mPrintingStrings/ParamTest.Success/a
 \e[0;32m[       OK ] \e[mPrintingStrings/ParamTest.Success/a
 \e[0;32m[ RUN      ] \e[mPrintingStrings/ParamTest.Failure/a
-gtest_output_test_.cc:#: Failure
-      Expected: "b"
-To be equal to: GetParam()
-      Which is: "a"
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  "b"
+  GetParam()
+    Which is: "a"
 Expected failure
+Stack trace: (omitted)
+
 \e[0;31m[  FAILED  ] \e[mPrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
 \e[0;32m[----------] \e[mGlobal test environment tear-down
 BarEnvironment::TearDown() called.
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected non-fatal failure.
+Stack trace: (omitted)
+
 FooEnvironment::TearDown() called.
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Failed
 Expected fatal failure.
-\e[0;32m[==========] \e[m66 tests from 29 test cases ran.
-\e[0;32m[  PASSED  ] \e[m22 tests.
-\e[0;31m[  FAILED  ] \e[m44 tests, listed below:
+Stack trace: (omitted)
+
+\e[0;32m[==========] \e[m85 tests from 40 test suites ran.
+\e[0;32m[  PASSED  ] \e[m31 tests.
+\e[0;31m[  FAILED  ] \e[m54 tests, listed below:
 \e[0;31m[  FAILED  ] \e[mNonfatalFailureTest.EscapesStringOperands
 \e[0;31m[  FAILED  ] \e[mNonfatalFailureTest.DiffForLongStrings
 \e[0;31m[  FAILED  ] \e[mFatalFailureTest.FatalFailureInSubroutine
 \e[0;31m[  FAILED  ] \e[mFatalFailureTest.FatalFailureInNestedSubroutine
 \e[0;31m[  FAILED  ] \e[mFatalFailureTest.NonfatalFailureInSubroutine
 \e[0;31m[  FAILED  ] \e[mLoggingTest.InterleavingLoggingAndAssertions
+\e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.AcceptedValues
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.ObeysScopes
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.WorksInLoop
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.WorksInSubroutine
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.CanBeNested
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.CanBeRepeated
 \e[0;31m[  FAILED  ] \e[mSCOPED_TRACETest.WorksConcurrently
+\e[0;31m[  FAILED  ] \e[mScopedTraceTest.WithExplicitFileAndLine
 \e[0;31m[  FAILED  ] \e[mNonFatalFailureInFixtureConstructorTest.FailureInConstructor
 \e[0;31m[  FAILED  ] \e[mFatalFailureInFixtureConstructorTest.FailureInConstructor
 \e[0;31m[  FAILED  ] \e[mNonFatalFailureInSetUpTest.FailureInSetUp
 \e[0;31m[  FAILED  ] \e[mFatalFailureInSetUpTest.FailureInSetUp
 \e[0;31m[  FAILED  ] \e[mAddFailureAtTest.MessageContainsSpecifiedFileAndLineNumber
-\e[0;31m[  FAILED  ] \e[mMixedUpTestCaseTest.ThisShouldFail
-\e[0;31m[  FAILED  ] \e[mMixedUpTestCaseTest.ThisShouldFailToo
-\e[0;31m[  FAILED  ] \e[mMixedUpTestCaseWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
+\e[0;31m[  FAILED  ] \e[mGtestFailAtTest.MessageContainsSpecifiedFileAndLineNumber
+\e[0;31m[  FAILED  ] \e[mMixedUpTestSuiteTest.ThisShouldFail
+\e[0;31m[  FAILED  ] \e[mMixedUpTestSuiteTest.ThisShouldFailToo
+\e[0;31m[  FAILED  ] \e[mMixedUpTestSuiteWithSameTestNameTest.TheSecondTestWithThisNameShouldFail
 \e[0;31m[  FAILED  ] \e[mTEST_F_before_TEST_in_same_test_case.DefinedUsingTESTAndShouldFail
 \e[0;31m[  FAILED  ] \e[mTEST_before_TEST_F_in_same_test_case.DefinedUsingTEST_FAndShouldFail
 \e[0;31m[  FAILED  ] \e[mExpectNonfatalFailureTest.FailsWhenThereIsNoNonfatalFailure
@@ -656,8 +1034,12 @@ Expected fatal failure.
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenStatementReturns
 \e[0;31m[  FAILED  ] \e[mExpectFatalFailureTest.FailsWhenStatementThrows
 \e[0;31m[  FAILED  ] \e[mTypedTest/0.Failure, where TypeParam = int
+\e[0;31m[  FAILED  ] \e[mTypedTestWithNames/char0.Failure, where TypeParam = char
+\e[0;31m[  FAILED  ] \e[mTypedTestWithNames/int1.Failure, where TypeParam = int
 \e[0;31m[  FAILED  ] \e[mUnsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
 \e[0;31m[  FAILED  ] \e[mUnsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
+\e[0;31m[  FAILED  ] \e[mUnsignedCustomName/TypedTestP/unsignedChar0.Failure, where TypeParam = unsigned char
+\e[0;31m[  FAILED  ] \e[mUnsignedCustomName/TypedTestP/unsignedInt1.Failure, where TypeParam = unsigned int
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectFatalFailure
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectNonFatalFailure
 \e[0;31m[  FAILED  ] \e[mExpectFailureTest.ExpectFatalFailureOnAllThreads
@@ -665,36 +1047,47 @@ Expected fatal failure.
 \e[0;31m[  FAILED  ] \e[mExpectFailureWithThreadsTest.ExpectFatalFailure
 \e[0;31m[  FAILED  ] \e[mExpectFailureWithThreadsTest.ExpectNonFatalFailure
 \e[0;31m[  FAILED  ] \e[mScopedFakeTestPartResultReporterTest.InterceptOnlyCurrentThread
+\e[0;31m[  FAILED  ] \e[mDynamicFixture.DynamicTestFail
+\e[0;31m[  FAILED  ] \e[mBadDynamicFixture1.TestBase
+\e[0;31m[  FAILED  ] \e[mBadDynamicFixture2.Derived
 \e[0;31m[  FAILED  ] \e[mPrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
 \e[0;31m[  FAILED  ] \e[mPrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
 
-44 FAILED TESTS
+54 FAILED TESTS
 \e[0;33m  YOU HAVE 1 DISABLED TEST
 
 \e[mNote: Google Test filter = FatalFailureTest.*:LoggingTest.*
-[==========] Running 4 tests from 2 test cases.
+[==========] Running 4 tests from 2 test suites.
 [----------] Global test environment set-up.
 [----------] 3 tests from FatalFailureTest
 [ RUN      ] FatalFailureTest.FatalFailureInSubroutine
 (expecting a failure that x should be 1)
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: x
-      Which is: 2
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  x
+    Which is: 2
+Stack trace: (omitted)
+
 [  FAILED  ] FatalFailureTest.FatalFailureInSubroutine (? ms)
 [ RUN      ] FatalFailureTest.FatalFailureInNestedSubroutine
 (expecting a failure that x should be 1)
-gtest_output_test_.cc:#: Failure
-      Expected: 1
-To be equal to: x
-      Which is: 2
+googletest-output-test_.cc:#: Failure
+Expected equality of these values:
+  1
+  x
+    Which is: 2
+Stack trace: (omitted)
+
 [  FAILED  ] FatalFailureTest.FatalFailureInNestedSubroutine (? ms)
 [ RUN      ] FatalFailureTest.NonfatalFailureInSubroutine
 (expecting a failure on false)
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Value of: false
   Actual: false
 Expected: true
+Stack trace: (omitted)
+
 [  FAILED  ] FatalFailureTest.NonfatalFailureInSubroutine (? ms)
 [----------] 3 tests from FatalFailureTest (? ms total)
 
@@ -703,17 +1096,21 @@ Expected: true
 (expecting 2 failures on (3) >= (a[i]))
 i == 0
 i == 1
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Expected: (3) >= (a[i]), actual: 3 vs 9
+Stack trace: (omitted)
+
 i == 2
 i == 3
-gtest_output_test_.cc:#: Failure
+googletest-output-test_.cc:#: Failure
 Expected: (3) >= (a[i]), actual: 3 vs 6
+Stack trace: (omitted)
+
 [  FAILED  ] LoggingTest.InterleavingLoggingAndAssertions (? ms)
 [----------] 1 test from LoggingTest (? ms total)
 
 [----------] Global test environment tear-down
-[==========] 4 tests from 2 test cases ran. (? ms total)
+[==========] 4 tests from 2 test suites ran. (? ms total)
 [  PASSED  ] 0 tests.
 [  FAILED  ] 4 tests, listed below:
 [  FAILED  ] FatalFailureTest.FatalFailureInSubroutine
@@ -723,21 +1120,21 @@ Expected: (3) >= (a[i]), actual: 3 vs 6
 
  4 FAILED TESTS
 Note: Google Test filter = *DISABLED_*
-[==========] Running 1 test from 1 test case.
+[==========] Running 1 test from 1 test suite.
 [----------] Global test environment set-up.
 [----------] 1 test from DisabledTestsWarningTest
 [ RUN      ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
 [       OK ] DisabledTestsWarningTest.DISABLED_AlsoRunDisabledTestsFlagSuppressesWarning
 [----------] Global test environment tear-down
-[==========] 1 test from 1 test case ran.
+[==========] 1 test from 1 test suite ran.
 [  PASSED  ] 1 test.
 Note: Google Test filter = PassingTest.*
 Note: This is test shard 2 of 2.
-[==========] Running 1 test from 1 test case.
+[==========] Running 1 test from 1 test suite.
 [----------] Global test environment set-up.
 [----------] 1 test from PassingTest
 [ RUN      ] PassingTest.PassingTest2
 [       OK ] PassingTest.PassingTest2
 [----------] Global test environment tear-down
-[==========] 1 test from 1 test case ran.
+[==========] 1 test from 1 test suite ran.
 [  PASSED  ] 1 test.