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

adb: win32: silence wine test failure.

Browse source 
Wine implements sockets with their own internal socketpair, which
results in the poll disconnect test failing.

Bug: http://b/117568356
Test: wine adb_test.exe
Change-Id: Icd2a94f8297fefd5c02e6517568fe288b168032c
This commit is contained in:
Josh Gao 2019-07-16 15:19:53 -07:00
parent efd8ae2d54
commit 2ad4c3696f
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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) {