commit 87032a8ad9973f20bed16d356a26ce6760612e57
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 27 00:11:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 00:11:26 2016 +0000
tree 211164580a4fbdae20b568c33ca079d584abe4e6
parent ccc1e3c635c64d4ed8bdd2ba6bccb3dd8eadf7c8
parent b329fd21f80e5d62a872316fd4e99c6ae85c8c3a

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

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

Change-Id: Id48542904272ac506eec121fa21cbed374b9408d

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