diff options
| author | Andreas Gampe <agampe@google.com> | 2015-02-23 17:15:47 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-02-23 17:15:47 -0800 |
| commit | 992b353402f2af3895d73c44c593037cabd0540f (patch) | |
| tree | 0576afa0307937067062c46cadfede15fd87483f /test/119-noimage-patchoat | |
| parent | 9e80e7fa5ef60f02f35823bc58969c3d5a03453e (diff) | |
| download | art-992b353402f2af3895d73c44c593037cabd0540f.tar.gz art-992b353402f2af3895d73c44c593037cabd0540f.tar.bz2 art-992b353402f2af3895d73c44c593037cabd0540f.zip | |
ART: Strip error message in run-test
It seems the output is flaky - sometimes the LOG(ERROR) makes it
to output.txt, sometimes it doesn't. So instead always strip it.
Change-Id: I409b98eb9a5bf0c2e6c1df16ff3b8013a2a85cc5
Diffstat (limited to 'test/119-noimage-patchoat')
| -rwxr-xr-x | test/119-noimage-patchoat/check | 2 | ||||
| -rw-r--r-- | test/119-noimage-patchoat/expected.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/119-noimage-patchoat/check b/test/119-noimage-patchoat/check index 7b47ac1495..57111bcc99 100755 --- a/test/119-noimage-patchoat/check +++ b/test/119-noimage-patchoat/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/119-noimage-patchoat/expected.txt b/test/119-noimage-patchoat/expected.txt index 3d2b4f1d9b..ed136621c3 100644 --- a/test/119-noimage-patchoat/expected.txt +++ b/test/119-noimage-patchoat/expected.txt @@ -1,7 +1,6 @@ Run -Xnoimage-dex2oat -Xpatchoat:/system/bin/false Has image is false, is image dex2oat enabled is false. Run -Xnoimage-dex2oat -Xpatchoat:/system/bin/false -Xno-dex-file-fallback -Dex file fallback disabled, cannot continue without image. Failed to initialize runtime (check log for details) Run -Ximage-dex2oat Has image is true, is image dex2oat enabled is true. |