commit 36c080b2c7bb96e559e9185f3e706738eace36b8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 01 23:20:27 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 01 23:20:27 2020 +0000
tree 572162c4baeb0f0070220e0627802419b80a1be3
parent a92d9124f389d99044766a5ec3775167a1473fe9
parent 42a0f372042242b4646c5a6cdc1a2952e3d494b2

Merge "Throw an exception if it fails to push a test case file."

android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java

diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
index 99fcfd9..b570b5a 100644
--- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
+++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
@@ -1413,10 +1413,12 @@
         checkInterrupted(); // throws if interrupted
 
         final String testCases = generateTestCaseTrie(batch.tests);
-
-        mDevice.executeShellCommand("rm " + APP_DIR + CASE_LIST_FILE_NAME);
+        final String testCaseFilename = APP_DIR + CASE_LIST_FILE_NAME;
+        mDevice.executeShellCommand("rm " + testCaseFilename);
         mDevice.executeShellCommand("rm " + APP_DIR + LOG_FILE_NAME);
-        mDevice.pushString(testCases + "\n", APP_DIR + CASE_LIST_FILE_NAME);
+        if (!mDevice.pushString(testCases + "\n", testCaseFilename)) {
+        	throw new RuntimeException("Failed to write test cases to " + testCaseFilename);
+		}
 
         final String instrumentationName =
                 "com.drawelements.deqp/com.drawelements.deqp.testercore.DeqpInstrumentation";