Set ANDROID_DATA for DalvikExecTest

Also increase timeout to allow for dexopt of BOOTCLASSPATH

Bug: 5310023
Change-Id: Icaa81a3bb3cea10c610e6ad671a001f6dbfeda17

1 files changed, 3 insertions, 3 deletions

diff --git a/support/src/test/java/tests/support/Support_Exec.java b/support/src/test/java/tests/support/Support_Exec.java
index 124dcdc..0502b9c 100644
--- a/support/src/test/java/tests/support/Support_Exec.java
+++ b/support/src/test/java/tests/support/Support_Exec.java
@@ -77,7 +77,7 @@ public class Support_Exec extends TestCase {
      * standard err, and returns. If the stream emits anything to standard err,
      * an AssertionFailedError will be thrown.
      *
-     * <p>This method assumes the target process will complete within ten
+     * <p>This method assumes the target process will complete within thirty
      * seconds. If it does not, an AssertionFailedError will be thrown.
      */
     public static String execAndGetOutput(ProcessBuilder builder) throws IOException {
@@ -92,8 +92,8 @@ public class Support_Exec extends TestCase {
             Throwable failure;
             String out = "";
             try {
-                out = outFuture.get(10, TimeUnit.SECONDS);
-                String err = errFuture.get(10, TimeUnit.SECONDS);
+                out = outFuture.get(30, TimeUnit.SECONDS);
+                String err = errFuture.get(30, TimeUnit.SECONDS);
                 failure = err.length() > 0
                         ? new AssertionFailedError("Unexpected err stream data:\n" + err)
                         : null;