ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I35f8843e,Icd2a94f8,I6c20f3b3

Browse source 
* changes:
  adb: win32: don't shutdown socket when closing.
  adb: win32: silence wine test failure.
  adb: win32: fix adb_test.
This commit is contained in:
Josh Gao 2019-07-17 18:04:29 +00:00 • committed by Gerrit Code Review
commit 1f1a0009fc
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adb/Android.bp
View file

@ -221,6 +221,7 @@ cc_test_host {
target: {
windows: {
enabled: true,
ldflags: ["-municode"],
shared_libs: ["AdbWinApi"],
},
},

21
adb/sysdeps_test.cpp
View file

@ -25,6 +25,21 @@
#include "sysdeps.h"
#include "sysdeps/chrono.h"
#if defined(_WIN32)
#include <windows.h>
static bool IsWine() {
HMODULE ntdll = GetModuleHandleW(L"ntdll.dll");
if (!ntdll) {
return false;
}
return GetProcAddress(ntdll, "wine_get_version") != nullptr;
}
#else
static bool IsWine() {
return false;
}
#endif
TEST(sysdeps_socketpair, smoke) {
int fds[2];
ASSERT_EQ(0, adb_socketpair(fds)) << strerror(errno);
@ -182,8 +197,10 @@ TEST_F(sysdeps_poll, disconnect) {
EXPECT_EQ(1, adb_poll(&pfd, 1, 100));
// Linux returns POLLIN | POLLHUP, Windows returns just POLLHUP.
EXPECT_EQ(POLLHUP, pfd.revents & POLLHUP);
if (!IsWine()) {
// Linux returns POLLIN | POLLHUP, Windows returns just POLLHUP.
EXPECT_EQ(POLLHUP, pfd.revents & POLLHUP);
}
}
TEST_F(sysdeps_poll, fd_count) {

9
adb/sysdeps_win32.cpp
View file

@ -610,15 +610,6 @@ static void _fh_socket_init(FH f) {
static int _fh_socket_close(FH f) {
if (f->fh_socket != INVALID_SOCKET) {
/* gently tell any peer that we're closing the socket */
if (shutdown(f->fh_socket, SD_BOTH) == SOCKET_ERROR) {
// If the socket is not connected, this returns an error. We want to
// minimize logging spam, so don't log these errors for now.
#if 0
D("socket shutdown failed: %s",
android::base::SystemErrorCodeToString(WSAGetLastError()).c_str());
#endif
}
if (closesocket(f->fh_socket) == SOCKET_ERROR) {
// Don't set errno here, since adb_close will ignore it.
const DWORD err = WSAGetLastError();