From e50abd67c54dcedfed7b58bd78c732772172bebe Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 5 Jul 2012 13:09:14 +0400
Subject: [PATCH] Android module: create emulator in tmp folder, catch
 exceptions during stopping emulator

---
 .../jet/compiler/CodegenTestsOnAndroidRunner.java         | 8 +++++++-
 .../src/org/jetbrains/jet/compiler/PathManager.java       | 8 ++++++++
 .../src/org/jetbrains/jet/compiler/emulator/Emulator.java | 2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java b/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java
index ca3e5c9c972..67ab11f2375 100644
--- a/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java
+++ b/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java
@@ -203,7 +203,13 @@ public class CodegenTestsOnAndroidRunner {
             return antRunner.runTestsOnEmulator();
         }
         finally {
-            emulator.stopEmulator();
+            try {
+                emulator.stopEmulator();
+            }
+            catch (Throwable t) {
+                System.err.println("Exception during stopping emulator:");
+                t.printStackTrace();
+            }
         }
     }
 
diff --git a/compiler/android-tests/src/org/jetbrains/jet/compiler/PathManager.java b/compiler/android-tests/src/org/jetbrains/jet/compiler/PathManager.java
index e7e9da3bba6..9d6145029ff 100644
--- a/compiler/android-tests/src/org/jetbrains/jet/compiler/PathManager.java
+++ b/compiler/android-tests/src/org/jetbrains/jet/compiler/PathManager.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.compiler;
 
+import java.io.File;
+
 /**
  * @author Natalia.Ukhorskaya
  */
@@ -34,6 +36,12 @@ public class PathManager {
         return getAndroidSdkRoot() + "/platforms";
     }
 
+    public String getAndroidEmulatorRoot() {
+        String androidEmulatorRoot = tmpFolder + "/emulator";
+        new File(androidEmulatorRoot).mkdirs();
+        return androidEmulatorRoot;
+    }
+
     public String getPlatformToolsFolderInAndroidSdk() {
         return getAndroidSdkRoot() + "/platform-tools";
     }
diff --git a/compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java b/compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java
index e82755d5909..ecbfa49b034 100644
--- a/compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java
+++ b/compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java
@@ -43,6 +43,8 @@ public class Emulator {
         commandLine.addParameter("--force");
         commandLine.addParameter("-n");
         commandLine.addParameter("my_avd");
+        commandLine.addParameter("-p");
+        commandLine.addParameter(pathManager.getAndroidEmulatorRoot());
         commandLine.addParameter("-t");
         commandLine.addParameter("1");
         return commandLine;