summaryrefslogtreecommitdiffstats
path: root/testing/android
diff options
context:
space:
mode:
authorjbudorick <jbudorick@chromium.org>2014-12-15 14:23:29 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-15 22:24:04 +0000
commit8f4952879b1ed5fb544e1ad86730672722c93e2e (patch)
treec1bae15a2d3b36ede4c3e2c04f077d3eb40c485f /testing/android
parente98d8d68c1cde7ae05386befdd797360c7900b76 (diff)
downloadchromium_src-8f4952879b1ed5fb544e1ad86730672722c93e2e.zip
chromium_src-8f4952879b1ed5fb544e1ad86730672722c93e2e.tar.gz
chromium_src-8f4952879b1ed5fb544e1ad86730672722c93e2e.tar.bz2
[Android] Implement gtest and local in platform mode.
BUG=428729 Review URL: https://codereview.chromium.org/788753002 Cr-Commit-Position: refs/heads/master@{#308441}
Diffstat (limited to 'testing/android')
-rw-r--r--testing/android/java/src/org/chromium/native_test/ChromiumNativeTestInstrumentationTestRunner.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/testing/android/java/src/org/chromium/native_test/ChromiumNativeTestInstrumentationTestRunner.java b/testing/android/java/src/org/chromium/native_test/ChromiumNativeTestInstrumentationTestRunner.java
index 5e8d8e5..8fe5d6c 100644
--- a/testing/android/java/src/org/chromium/native_test/ChromiumNativeTestInstrumentationTestRunner.java
+++ b/testing/android/java/src/org/chromium/native_test/ChromiumNativeTestInstrumentationTestRunner.java
@@ -114,7 +114,6 @@ public class ChromiumNativeTestInstrumentationTestRunner extends Instrumentation
r = new BufferedReader(
new InputStreamReader(new BufferedInputStream(new FileInputStream(fifo))));
- StringBuilder resultsStr = new StringBuilder();
for (String l = r.readLine(); l != null && !l.equals("<<ScopedMainEntryLogger");
l = r.readLine()) {
Matcher m = RE_TEST_OUTPUT.matcher(l);
@@ -127,11 +126,9 @@ public class ChromiumNativeTestInstrumentationTestRunner extends Instrumentation
results.put(m.group(2), TestResult.PASSED);
}
}
- resultsStr.append(l);
- resultsStr.append("\n");
+ mLogBundle.putString(Instrumentation.REPORT_KEY_STREAMRESULT, l + "\n");
+ sendStatus(0, mLogBundle);
}
- mLogBundle.putString(Instrumentation.REPORT_KEY_STREAMRESULT, resultsStr.toString());
- sendStatus(0, mLogBundle);
} catch (InterruptedException e) {
Log.e(TAG, "Interrupted while waiting for FIFO file creation: " + e.toString());
} catch (FileNotFoundException e) {