[zorg] r306896 - Revert "[asan] Try to run tests without "shell stop""

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Fri Jun 30 15:08:49 2017
New Revision: 306896

URL: http://llvm.org/viewvc/llvm-project?rev=306896&view=rev
Log:
Revert "[asan] Try to run tests without "shell stop""

Some tests still fail.

This reverts commit r306886.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=306896&r1=306895&r2=306896&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Fri Jun 30 15:08:49 2017
@@ -165,6 +165,14 @@ function test_android_on_device { # ARCH
   $ADB wait-for-device
   $ADB devices
 
+  # Nexus Player does not have enough RAM to run ASan tests reliably.
+  # Luckily, none of our tests need the application runtime, and killing
+  # that can free several hundred megs of RAM.
+  if [[ $_build_flavor == fugu* || $_build_flavor == volantis* ]]; then
+    $ADB shell stop
+    sleep 2
+  fi
+
   # Kill leftover symbolizers. TODO: figure out what's going on.
   $ADB shell pkill llvm-symbolizer || true