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

Android tests: start adb server before emulator start, print emulator log to console

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-02-26 19:48:49 +04:00
parent ab792a587c
commit efe74a3b88
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/src/org/jetbrains/jet/compiler/emulator/Emulator.java
+24 -4
View File
@@ -102,12 +102,32 @@ public class Emulator {
OutputUtils.checkResult(RunUtils.execute(getCreateCommand(), "no")); OutputUtils.checkResult(RunUtils.execute(getCreateCommand(), "no"));
} }
public void startServer() {
public void startEmulator() { GeneralCommandLine commandLine = new GeneralCommandLine();
System.out.println("Starting emulator..."); String adbCmdName = SystemInfo.isWindows ? "adb.exe" : "adb";
OutputUtils.checkResult(RunUtils.executeOnSeparateThread(getStartCommand(), false)); commandLine.setExePath(pathManager.getPlatformToolsFolderInAndroidSdk() + "/" + adbCmdName);
commandLine.addParameter("start-server");
System.out.println("Start adb server...");
OutputUtils.checkResult(RunUtils.execute(commandLine));
} }
public void startEmulator() {
startServer();
System.out.println("Starting emulator...");
OutputUtils.checkResult(RunUtils.executeOnSeparateThread(getStartCommand(), false));
printLog();
}
public void printLog() {
GeneralCommandLine commandLine = new GeneralCommandLine();
String adbCmdName = SystemInfo.isWindows ? "adb.exe" : "adb";
commandLine.setExePath(pathManager.getPlatformToolsFolderInAndroidSdk() + "/" + adbCmdName);
commandLine.addParameter("logcat");
commandLine.addParameter("-v");
commandLine.addParameter("time");
commandLine.addParameter("*:I");
OutputUtils.checkResult(RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(commandLine, null, false, "LOGCAT: ", true)));
}
public void waitEmulatorStart() { public void waitEmulatorStart() {
System.out.println("Waiting for emulator start..."); System.out.println("Waiting for emulator start...");