azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android tests: do not call adb emu kill (throws exception if there are more than 1 emulator)

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-02-26 19:46:11 +04:00
parent 4ba4ac7e4e
commit ab792a587c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java
+8 -8
View File
@@ -19,6 +19,7 @@ package org.jetbrains.jet.compiler.emulator;
import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.compiler.OutputUtils; import org.jetbrains.jet.compiler.OutputUtils;
import org.jetbrains.jet.compiler.PathManager; import org.jetbrains.jet.compiler.PathManager;
import org.jetbrains.jet.compiler.ThreadUtils; import org.jetbrains.jet.compiler.ThreadUtils;
@@ -83,20 +84,17 @@ public class Emulator {
return commandLine; return commandLine;
} }
@Nullable
private GeneralCommandLine getStopCommand() { private GeneralCommandLine getStopCommand() {
GeneralCommandLine commandLine = new GeneralCommandLine();
if (SystemInfo.isWindows) { if (SystemInfo.isWindows) {
GeneralCommandLine commandLine = new GeneralCommandLine();
commandLine.setExePath("taskkill"); commandLine.setExePath("taskkill");
commandLine.addParameter("/F"); commandLine.addParameter("/F");
commandLine.addParameter("/IM"); commandLine.addParameter("/IM");
commandLine.addParameter("emulator-arm.exe"); commandLine.addParameter("emulator-arm.exe");
return commandLine;
} }
else { return null;
commandLine.setExePath(pathManager.getPlatformToolsFolderInAndroidSdk() + "/adb");
commandLine.addParameter("emu");
commandLine.addParameter("kill");
}
return commandLine;
} }
public void createEmulator() { public void createEmulator() {
@@ -118,7 +116,9 @@ public class Emulator {
public void stopEmulator() { public void stopEmulator() {
System.out.println("Stopping emulator..."); System.out.println("Stopping emulator...");
OutputUtils.checkResult(RunUtils.execute(getStopCommand())); if (SystemInfo.isWindows) {
OutputUtils.checkResult(RunUtils.execute(getStopCommand()));
}
finishProcess("emulator-arm"); finishProcess("emulator-arm");
} }