[zorg] r236798 - Add step to remove all forward socket connections before running test on android

[Ying Chen]

Author: chying
Date: Thu May  7 19:12:48 2015
New Revision: 236798

URL: http://llvm.org/viewvc/llvm-project?rev=236798&view=rev
Log:
Add step to remove all forward socket connections before running test on android

Summary: Forward socket connections were not removed for crashed tests, and this left many open socket connections on slave machine. Add step on buildbot to remove all forwarded ports.

Test Plan: Test on local buildbot master

Reviewers: sivachandra, chaoren, vharron

Subscribers: tberghammer, llvm-commits

Differential Revision: http://reviews.llvm.org/D9578

Modified:
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=236798&r1=236797&r2=236798&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Thu May  7 19:12:48 2015
@@ -281,6 +281,17 @@ def getLLDBTestSteps(f,
                     testenv['LLDB_TEST_THREADS'] = '8'
                     extraTestFlag = ' -m'
                     urlStr = 'adb://%(deviceid)s:%(remote_port)s'
+                    # for Android, remove all forwarded ports before running test
+                    # it is noticed that forwarded socket connections were not cleaned for certain crashed tests
+                    # clean it here to avoid too many "LISTEN" ports left on slave
+                    f.addStep(ShellCommand(name="remove port forwarding %s" % arch,
+                                           command=['adb',
+                                                    'forward',
+                                                    '--remove-all'],
+                                           description="Remove port forwarding",
+                                           env=env,
+                                           haltOnFailure=False,
+                                           workdir='%s' % llvm_builddir))
                 DOTEST_OPTS += ''.join([' --platform-name remote-' + remote_platform,
                                         ' --platform-url ' + urlStr,
                                         ' --platform-working-dir %(remote_dir)s',