Add smoke tests to emulator-smoke.
Also improve error reporting for get target failures.
Change-Id: I084db3f0d9719dec2b34cf42b7d3defef69a3a81
diff --git a/prod-tests/res/config/sdk/emulator-smoke.xml b/prod-tests/res/config/sdk/emulator-smoke.xml
index e71e189..153ec9e 100644
--- a/prod-tests/res/config/sdk/emulator-smoke.xml
+++ b/prod-tests/res/config/sdk/emulator-smoke.xml
@@ -19,4 +19,9 @@
<target_preparer class="com.android.tradefed.targetprep.SdkAvdPreparer" />
<test class="com.android.sdk.tests.EmulatorSmokeTest" />
<test class="com.android.sdk.tests.EmulatorTests" />
+ <test class="com.android.continuous.SmokeTest" >
+ <option name="package" value="com.android.smoketest.tests" />
+ <option name="runner" value="com.android.smoketest.SmokeTestRunner" />
+ <option name="capture-file-pattern" key="/data/anr/traces.txt" value="text" />
+ </test>
</configuration>
diff --git a/src/com/android/tradefed/targetprep/SdkAvdPreparer.java b/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
index eb75088..3969795 100644
--- a/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
+++ b/src/com/android/tradefed/targetprep/SdkAvdPreparer.java
@@ -106,8 +106,9 @@
sdkBuild.getAndroidToolPath(), "list", "targets", "--compact");
if (!result.getStatus().equals(CommandStatus.SUCCESS)) {
throw new TargetSetupError(String.format(
- "Unable to get list of SDK targets using %s. Result %s, err %s",
- sdkBuild.getAndroidToolPath(), result.getStatus(), result.getStderr()));
+ "Unable to get list of SDK targets using %s. Result %s. stdout: %s, err: %s",
+ sdkBuild.getAndroidToolPath(), result.getStatus(), result.getStdout(),
+ result.getStderr()));
}
String[] targets = result.getStdout().split("\n");
if (result.getStdout().trim().isEmpty() || targets.length == 0) {