Makes gtest compile clean with gcc -Wall -Werror (by Zhanyong Wan); refactors scons script (by Vlad Losev).

2009-07-22 02:16:37 +00:00
parent c214ebc830
commit 16b9431ae0
11 changed files with 150 additions and 145 deletions
--- a/test/gtest_output_test_golden_lin.txt
+++ b/test/gtest_output_test_golden_lin.txt
@@ -390,7 +390,8 @@ Expected failure
 gtest_output_test_.cc:#: Failure
 Value of: TypeParam()
  Actual: \0
-Expected: 1
+Expected: 1U
+Which is: 1
 Expected failure
 [0;31m[  FAILED  ] [mUnsigned/TypedTestP/0.Failure
 [0;32m[----------] [m2 tests from Unsigned/TypedTestP/1, where TypeParam = unsigned int
@@ -400,7 +401,8 @@ Expected failure
 gtest_output_test_.cc:#: Failure
 Value of: TypeParam()
  Actual: 0
-Expected: 1
+Expected: 1U
+Which is: 1
 Expected failure
 [0;31m[  FAILED  ] [mUnsigned/TypedTestP/1.Failure
 [0;32m[----------] [m4 tests from ExpectFailureTest