all: adjustments

android/emulator/emulator.v

@@ -89,8 +89,8 @@ pub fn (o &Options) validate() ! {
 	}
 }
 
-// new returns a new `Emulator` instance.
-pub fn new(config Config) !Emulator {
+// make returns an `Emulator` instance.
+pub fn make(config Config) !Emulator {
 	if !env.has_emulator() {
 		return error('${@MOD}.${@STRUCT}.${@FN}: the `emulator` needs to be installed in the Android SDK. Use `vab install emulator` to install it.')
 	}
@@ -227,6 +227,10 @@ fn (mut e Emulator) run_process(options Options) {
 		if !p.is_alive() {
 			action = 2
 			e.options.verbose(3, 'Emulator process not alive anymore')
+			stdout := p.stdout_slurp()
+			stderr := p.stderr_slurp()
+			println(stdout)
+			eprintln(stderr)
 			e.thread_status = .stopped
 			$if debug {
 				eprintln('> ${@STRUCT}.${@FN}: waiting for process; action: "${action}" status: "${p.status}"')

cli/doctor.v

@@ -49,6 +49,9 @@ See https://stackoverflow.com/a/61176718/1904615 for more help.\n'
 		}
 	}
 
+	avdmanager := env.avdmanager()
+	emulator := env.emulator()
+
 	// Try to warn about broken Java distributions like IBM's Semeru
 	java_exe := java.jre_java_exe()
 	if os.is_executable(java_exe) {
@@ -70,10 +73,10 @@ See https://stackoverflow.com/a/61176718/1904615 for more help.\n'
 
 	// vab section
 	println('${exe_short_name}
-	Version ${exe_version} ${exe_git_hash}
-	Path "${exe_dir}"
+	Version    ${exe_version} ${exe_git_hash}
+	Path       "${exe_dir}"
 	Base files "${default_base_files_path}"
-	os.args: ${os.args}')
+	os.args:   "${os.args}"')
 
 	// Shell environment
 	print_var_if_set := fn (vars map[string]string, var_name string) {
@@ -91,15 +94,21 @@ See https://stackoverflow.com/a/61176718/1904615 for more help.\n'
 	println('Java
 	JDK
 		Version ${java.jdk_version()}
-		Path "${java.jdk_root()}"
+		Path    "${java.jdk_root()}"
 		Keytool "${keytool}"')
 
 	// Android section
 	println('Android
 	ENV
 		sdkmanager "${sdkm}"
-		sdkmanager.version "${env.sdkmanager_version()}"
-		Managable ${env_managable}
+		sdkmanager.version "${env.sdkmanager_version()}"')
+	if avdmanager != '' {
+		println('\t\tavdmanager "${avdmanager}"')
+	}
+	if emulator != '' {
+		println('\t\temulator   "${emulator}"')
+	}
+	println('\t\tManagable ${env_managable}
 	SDK
 		Path "${sdk.root()}"
 		Writable ${os.is_writable(sdk.root())}

tests/at-runtime/emulator/emulator_test.vv

@@ -16,7 +16,7 @@ const env_is_managable = env.managable()
 fn test_run_on_emulator() {
 	ensure_env()
 
-  mut emu := emulator.new()!
+  mut emu := emulator.make()!
   emu.start(
     verbosity: 3
     await_boot: true