From 32a2b60c4e2213b6303031768dc71c4fd6ceb4cf Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Tue, 9 Feb 2016 16:44:54 -0800 Subject: [PATCH] adb: allow wine's output for sysdeps_win32 strerror test. Change-Id: Ia5d04a2347df1bcd8c7efcc1da9cec9725007a58 (cherry picked from commit 22554c91676d8981fbfc8b4811d8be3b78a0b74a) --- adb/sysdeps_win32_test.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adb/sysdeps_win32_test.cpp b/adb/sysdeps_win32_test.cpp index 8f610cfda..c3a3fd7c1 100755 --- a/adb/sysdeps_win32_test.cpp +++ b/adb/sysdeps_win32_test.cpp @@ -87,8 +87,12 @@ TEST(sysdeps_win32, adb_strerror) { TestAdbStrError(-1, "Unknown error"); // Test very big, positive unknown error. TestAdbStrError(1000000, "Unknown error"); + // Test success case. - TestAdbStrError(0, "No error"); + // Wine returns "Success" for strerror(0), Windows returns "No error", so accept both. + std::string success = adb_strerror(0); + EXPECT_TRUE(success == "Success" || success == "No error") << "strerror(0) = " << success; + // Test error that regular strerror() should have a string for. TestAdbStrError(EPERM, "Operation not permitted"); // Test error that regular strerror() doesn't have a string for, but that