commit 2a66809d28c9ee1cbabe52991dbf526095c96c04
author Nicolas Geoffray <ngeoffray@google.com> Thu Mar 15 15:49:38 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 15 15:49:38 2018 +0000
tree a8acdab32e8d34a42403aa407f85f1a9625be741
parent a1fb634e37547dc238449678bfa73a0f58ff0eed
parent 6f7d8b7c79d6d560ca70c22ec572b7a5cc3cb225

Merge "Stop netd before running tests on Buildbot devices."

tools/setup-buildbot-device.sh

diff --git a/tools/setup-buildbot-device.sh b/tools/setup-buildbot-device.sh
index 546a6bf..9373c69 100755
--- a/tools/setup-buildbot-device.sh
+++ b/tools/setup-buildbot-device.sh
@@ -57,6 +57,16 @@
 adb shell ifconfig lo up
 adb shell ifconfig
 
+# When netd is running, some libcore and JDWP tests fail with this
+# exception (b/74725685):
+#
+#   android.system.ErrnoException: connect failed: EBADMSG (Not a data message)
+#
+# Turn it off to make these tests pass.
+echo -e "${green}Turning off netd${nc}"
+adb shell stop netd
+adb shell getprop init.svc.netd
+
 echo -e "${green}List properties${nc}"
 adb shell getprop