Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "6cd3823783082f1d78031ca8e3df5850532c58a7"
Commit ee39a89d authored by shiqian's avatar shiqian
Browse files

Adds suffix 'd' to gtest's libs on Windows. Also fixes gtest_unittest on... 

Adds suffix 'd' to gtest's libs on Windows.  Also fixes gtest_unittest on non-English Windows.  By balazs.dan@gmail.com.
parent 36865d8d
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 59 deletions
msvc/gtest.vcproj
View file @ ee39a89d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)/gtest.lib"/> OutputFile="$(OutDir)/gtestd.lib"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
<Tool <Tool
......
msvc/gtest_main.vcproj
View file @ ee39a89d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="$(OutDir)/$(ProjectName).lib"/> OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
<Tool <Tool
......
test/gtest_unittest.cc
View file @ ee39a89d
...@@ -2720,85 +2720,40 @@ TEST(HRESULTAssertionTest, EXPECT_HRESULT_SUCCEEDED) { ...@@ -2720,85 +2720,40 @@ TEST(HRESULTAssertionTest, EXPECT_HRESULT_SUCCEEDED) {
EXPECT_HRESULT_SUCCEEDED(S_OK); EXPECT_HRESULT_SUCCEEDED(S_OK);
EXPECT_HRESULT_SUCCEEDED(S_FALSE); EXPECT_HRESULT_SUCCEEDED(S_FALSE);
#ifdef _WIN32_WCE
const char* expected =
"Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
" Actual: 0x8000FFFF";
#else // Windows proper
const char* expected =
"Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
" Actual: 0x8000FFFF Catastrophic failure";
#endif // _WIN32_WCE
EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()), EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
expected); "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
" Actual: 0x8000FFFF");
} }
TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) { TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) {
ASSERT_HRESULT_SUCCEEDED(S_OK); ASSERT_HRESULT_SUCCEEDED(S_OK);
ASSERT_HRESULT_SUCCEEDED(S_FALSE); ASSERT_HRESULT_SUCCEEDED(S_FALSE);
#ifdef _WIN32_WCE
const char* expected =
"Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
" Actual: 0x8000FFFF";
#else // Windows proper
const char* expected =
"Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
" Actual: 0x8000FFFF Catastrophic failure";
#endif // _WIN32_WCE
EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()), EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
expected); "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
" Actual: 0x8000FFFF");
} }
TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) { TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) {
EXPECT_HRESULT_FAILED(E_UNEXPECTED); EXPECT_HRESULT_FAILED(E_UNEXPECTED);
#ifdef _WIN32_WCE
const char* expected_success =
"Expected: (OkHRESULTSuccess()) fails.\n"
" Actual: 0x00000000";
const char* expected_incorrect_function =
"Expected: (FalseHRESULTSuccess()) fails.\n"
" Actual: 0x00000001";
#else // Windows proper
const char* expected_success =
"Expected: (OkHRESULTSuccess()) fails.\n"
" Actual: 0x00000000 The operation completed successfully";
const char* expected_incorrect_function =
"Expected: (FalseHRESULTSuccess()) fails.\n"
" Actual: 0x00000001 Incorrect function.";
#endif // _WIN32_WCE
EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()), EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()),
expected_success); "Expected: (OkHRESULTSuccess()) fails.\n"
" Actual: 0x00000000");
EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()), EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()),
expected_incorrect_function); "Expected: (FalseHRESULTSuccess()) fails.\n"
" Actual: 0x00000001");
} }
TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) { TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) {
ASSERT_HRESULT_FAILED(E_UNEXPECTED); ASSERT_HRESULT_FAILED(E_UNEXPECTED);
#ifdef _WIN32_WCE
const char* expected_success =
"Expected: (OkHRESULTSuccess()) fails.\n"
" Actual: 0x00000000";
const char* expected_incorrect_function =
"Expected: (FalseHRESULTSuccess()) fails.\n"
" Actual: 0x00000001";
#else // Windows proper
const char* expected_success =
"Expected: (OkHRESULTSuccess()) fails.\n"
" Actual: 0x00000000 The operation completed successfully";
const char* expected_incorrect_function =
"Expected: (FalseHRESULTSuccess()) fails.\n"
" Actual: 0x00000001 Incorrect function.";
#endif // _WIN32_WCE
EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()), EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()),
expected_success); "Expected: (OkHRESULTSuccess()) fails.\n"
" Actual: 0x00000000");
EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()), EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()),
expected_incorrect_function); "Expected: (FalseHRESULTSuccess()) fails.\n"
" Actual: 0x00000001");
} }
// Tests that streaming to the HRESULT macros works. // Tests that streaming to the HRESULT macros works.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment