gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes the autotools scripts work on Mac OS X. Also hopefully makes gtest compile on Windows CE.

Browse Source
This commit is contained in:
shiqian
2008-07-08 21:32:17 +00:00
parent d201456903
commit e4e9a8bd7d
10 changed files with 25 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/gtest_output_test.py
View File

@@ -158,7 +158,7 @@ def GetCommandOutput(cmd):
"""
# Disables exception pop-ups on Windows.
os.environ['GUNIT_CATCH_EXCEPTIONS'] = '1'
os.environ['GTEST_CATCH_EXCEPTIONS'] = '1'
return NormalizeOutput(GetShellCommandOutput(cmd, ''))

20
test/gtest_output_test_golden_win.txt
View File

@@ -54,7 +54,7 @@ This failure is expected, and shouldn't have a trace.
gtest_output_test_.cc:#: Failure
Failed
This failure is expected, and should have a trace.
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: Expected trace
gtest_output_test_.cc:#: Failure
Failed
@@ -66,13 +66,13 @@ gtest_output_test_.cc:#: Failure
Value of: n
Actual: 1
Expected: 2
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: i = 1
gtest_output_test_.cc:#: Failure
Value of: n
Actual: 2
Expected: 1
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: i = 2
[ FAILED ] SCOPED_TRACETest.WorksInLoop
[ RUN ] SCOPED_TRACETest.WorksInSubroutine
@@ -81,13 +81,13 @@ gtest_output_test_.cc:#: Failure
Value of: n
Actual: 1
Expected: 2
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: n = 1
gtest_output_test_.cc:#: Failure
Value of: n
Actual: 2
Expected: 1
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: n = 2
[ FAILED ] SCOPED_TRACETest.WorksInSubroutine
[ RUN ] SCOPED_TRACETest.CanBeNested
@@ -96,7 +96,7 @@ gtest_output_test_.cc:#: Failure
Value of: n
Actual: 2
Expected: 1
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: n = 2
gtest_output_test_.cc:#:
[ FAILED ] SCOPED_TRACETest.CanBeNested
@@ -105,25 +105,25 @@ gtest_output_test_.cc:#:
gtest_output_test_.cc:#: Failure
Failed
This failure is expected, and should contain trace point A.
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: A
gtest_output_test_.cc:#: Failure
Failed
This failure is expected, and should contain trace point A and B.
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: B
gtest_output_test_.cc:#: A
gtest_output_test_.cc:#: Failure
Failed
This failure is expected, and should contain trace point A, B, and C.
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: C
gtest_output_test_.cc:#: B
gtest_output_test_.cc:#: A
gtest_output_test_.cc:#: Failure
Failed
This failure is expected, and should contain trace point A, B, and D.
gUnit trace:
Google Test trace:
gtest_output_test_.cc:#: D
gtest_output_test_.cc:#: B
gtest_output_test_.cc:#: A

2
test/gtest_repeat_test.cc
View File

@@ -110,11 +110,13 @@ int g_death_test_count = 0;
TEST(BarDeathTest, ThreadSafeAndFast) {
g_death_test_count++;
#ifdef GTEST_HAS_DEATH_TEST
GTEST_FLAG(death_test_style) = "threadsafe";
EXPECT_DEATH(abort(), "");
GTEST_FLAG(death_test_style) = "fast";
EXPECT_DEATH(abort(), "");
#endif // GTEST_HAS_DEATH_TEST
}
// Resets the count for each test.

11
test/gtest_uninitialized_test.py
View File

@@ -80,8 +80,15 @@ def GetOutput(command):
def TestExitCodeAndOutput(command):
"""Runs the given command and verifies its exit code and output."""
# 256 corresponds to return code 0.
AssertEq(256, os.system(command))
# Verifies that 'command' exits with code 1.
if IS_WINDOWS:
# On Windows, os.system(command) returns the exit code of 'command'.
AssertEq(1, os.system(command))
else:
# On Unix-like system, os.system(command) returns 256 times the
# exit code of 'command'.
AssertEq(256, os.system(command))
output = GetOutput(command)
Assert('InitGoogleTest' in output)