diff options
| author | 2015-02-18 18:30:05 -0800 | |
|---|---|---|
| committer | 2015-02-18 18:30:05 -0800 | |
| commit | 675eed3d5a9bd6eac8b2f56a935ea959c18fd5df (patch) | |
| tree | 48d1c020d8b71bdac71e74a47fbb19079392fe89 | |
| parent | 627fbe3137995904c2d67822d79201e17225e797 (diff) | |
ART: Fix run-test 099-vmdebug for device
We can't expect logcat errors on device. So just swallow them whole.
Bug: 18713034
Change-Id: I58d8595e86f112442a5a1c4c6ef0d614871d890f
| -rwxr-xr-x | test/099-vmdebug/check | 2 | ||||
| -rw-r--r-- | test/099-vmdebug/expected.txt | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/test/099-vmdebug/check b/test/099-vmdebug/check index 7b47ac1495..57111bcc99 100755 --- a/test/099-vmdebug/check +++ b/test/099-vmdebug/check @@ -15,6 +15,6 @@ # limitations under the License. # Strip the process pids and line numbers from exact error messages. -sed -e 's/^art E.*\] //' "$2" > "$2.tmp" +sed -e '/^art E.*\] /d' "$2" > "$2.tmp" diff --strip-trailing-cr -q "$1" "$2.tmp" >/dev/null diff --git a/test/099-vmdebug/expected.txt b/test/099-vmdebug/expected.txt index 392efe5bcd..579f98fe7c 100644 --- a/test/099-vmdebug/expected.txt +++ b/test/099-vmdebug/expected.txt @@ -7,17 +7,13 @@ status=2 status=0 Test starting when already started status=1 -Trace already in progress, ignoring this request status=1 Test stopping when already stopped status=0 -Trace stop requested, but no trace currently running status=0 Test tracing with empty filename -Unable to open trace file '': No such file or directory Got expected exception Test tracing with bogus (< 1024 && != 0) filesize Got expected exception Test sampling with bogus (<= 0) interval -Invalid sampling interval: 0 Got expected exception |