commit b329fd21f80e5d62a872316fd4e99c6ae85c8c3a
author Josh Gao <jmgao@google.com> Wed Apr 27 00:07:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 00:07:46 2016 +0000
tree 986220ab47ef4be1d38ce446c23429fcd2b33fd0
parent a5cad09af634000f462f108cce6c6486b7d9bf4d
parent cda542b2f8aaa7d8061fa241be4f8f981dc347f0

Merge "adb: decrease the number of fds used in fd_count test."
am: c296440

* commit 'c2964402b6ff91126bbbf7dd453adca40a13bd64':
  adb: decrease the number of fds used in fd_count test.

Change-Id: Id078e3b319bdd8591b78898e543a636f9eac6bf0

adb/sysdeps_test.cpp

diff --git a/adb/sysdeps_test.cpp b/adb/sysdeps_test.cpp
index f0c334e..fde344a 100644
--- a/adb/sysdeps_test.cpp
+++ b/adb/sysdeps_test.cpp
@@ -218,7 +218,7 @@
 
 TEST_F(sysdeps_poll, fd_count) {
     // https://code.google.com/p/android/issues/detail?id=12141
-    static constexpr int num_sockets = 512;
+    static constexpr int num_sockets = 256;
     std::vector<int> sockets;
     std::vector<adb_pollfd> pfds;
     sockets.resize(num_sockets * 2);