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

Merge "adb: fix shell_service_protocol_test for Windows."

Browse source
This commit is contained in:
David Pursell 2015-09-12 01:30:20 +00:00 • committed by Gerrit Code Review
commit 7b749acd5f
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/Android.mk
View file

@ -133,8 +133,6 @@ LOCAL_SRC_FILES := \
$(LIBADB_TEST_SRCS) \ $(LIBADB_TEST_SRCS) \
$(LIBADB_TEST_linux_SRCS) \ $(LIBADB_TEST_linux_SRCS) \
shell_service_protocol.cpp \ shell_service_protocol.cpp \
LOCAL_SRC_FILES_linux := \
shell_service_protocol_test.cpp \ shell_service_protocol_test.cpp \
LOCAL_SANITIZE := $(adb_target_sanitize) LOCAL_SANITIZE := $(adb_target_sanitize)
@ -155,11 +153,9 @@ LOCAL_SRC_FILES := \
$(LIBADB_TEST_SRCS) \ $(LIBADB_TEST_SRCS) \
services.cpp \ services.cpp \
shell_service_protocol.cpp \ shell_service_protocol.cpp \
LOCAL_SRC_FILES_linux := \
$(LIBADB_TEST_linux_SRCS) \
shell_service_protocol_test.cpp \ shell_service_protocol_test.cpp \
LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS)
LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS) LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)
LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS) LOCAL_SRC_FILES_windows := $(LIBADB_TEST_windows_SRCS)
LOCAL_SANITIZE := $(adb_host_sanitize) LOCAL_SANITIZE := $(adb_host_sanitize)

4
adb/shell_service_protocol_test.cpp
View file

@ -72,13 +72,17 @@ class ShellProtocolTest : public ::testing::Test {
read_protocol_->buffer_end_ = read_protocol_->data() + size; read_protocol_->buffer_end_ = read_protocol_->data() + size;
} }
#if !defined(_WIN32)
static sig_t saved_sigpipe_handler_; static sig_t saved_sigpipe_handler_;
#endif
int read_fd_ = -1, write_fd_ = -1; int read_fd_ = -1, write_fd_ = -1;
ShellProtocol *read_protocol_ = nullptr, *write_protocol_ = nullptr; ShellProtocol *read_protocol_ = nullptr, *write_protocol_ = nullptr;
}; };
#if !defined(_WIN32)
sig_t ShellProtocolTest::saved_sigpipe_handler_ = nullptr; sig_t ShellProtocolTest::saved_sigpipe_handler_ = nullptr;
#endif
namespace { namespace {

5
adb/sysdeps_win32.cpp
View file

@ -1121,6 +1121,11 @@ bip_buffer_write( BipBuffer bip, const void* src, int len )
BIPD(( "bip_buffer_write: enter %d->%d len %d", bip->fdin, bip->fdout, len )); BIPD(( "bip_buffer_write: enter %d->%d len %d", bip->fdin, bip->fdout, len ));
BIPDUMP( src, len ); BIPDUMP( src, len );
if (bip->closed) {
errno = EPIPE;
return -1;
}
EnterCriticalSection( &bip->lock ); EnterCriticalSection( &bip->lock );
while (!bip->can_write) { while (!bip->can_write) {