diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-30 17:32:03 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-05-01 17:09:34 -0700 |
| commit | 92af733ee202caa3b5475fe27fcc81582f11e7c8 (patch) | |
| tree | 0e5d4bc49cc6299f80a0cccd4ba205d5dfcbb3cb /adb/adb_io_test.cpp | |
| parent | 5cffd971997ace97ebfd2ecb7d43a64c03cf3169 (diff) | |
| download | system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.zip system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.tar.gz system_core-92af733ee202caa3b5475fe27fcc81582f11e7c8.tar.bz2 | |
More adb buffer fixes.
This patch factors out a lot of the basic protocol code: sending OKAY,
sending FAIL, and sending a length-prefixed string.
ADB_TRACE has been non-optional for a long time, so let's just remove
the #ifs.
Also actually build the device tracker test tool (and remove its duplicate).
Bug: http://b/20666660
Change-Id: I6c7d59f18707bdc62ca69dea45547617f9f31fc6
(cherry picked from commit e67f1f87d9b1188ec8617035db7006c37ee7b21e)
Diffstat (limited to 'adb/adb_io_test.cpp')
| -rw-r--r-- | adb/adb_io_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/adb_io_test.cpp b/adb/adb_io_test.cpp index da340b2..dd09919 100644 --- a/adb/adb_io_test.cpp +++ b/adb/adb_io_test.cpp @@ -139,13 +139,13 @@ TEST(io, WriteFdExactly_ENOSPC) { ASSERT_EQ(ENOSPC, errno); } -TEST(io, WriteStringFully) { +TEST(io, WriteFdExactly_string) { const char str[] = "Foobar"; TemporaryFile tf; ASSERT_NE(-1, tf.fd); // Test writing a partial string to the file. - ASSERT_TRUE(WriteStringFully(tf.fd, str)) << strerror(errno); + ASSERT_TRUE(WriteFdExactly(tf.fd, str)) << strerror(errno); ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0)); std::string s; |