diff options
| author | Andreas Gampe <agampe@google.com> | 2015-02-24 01:17:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-24 01:17:54 +0000 |
| commit | 40c99de1fd26f9ba6fae20a01175240b96fc7443 (patch) | |
| tree | aff0f707cb27e303d3b9de53f961bf48e38ad5be | |
| parent | 39ce2282ed2b020e51e8d92f442b419ae9dd6434 (diff) | |
| parent | 992b353402f2af3895d73c44c593037cabd0540f (diff) | |
| download | art-40c99de1fd26f9ba6fae20a01175240b96fc7443.zip art-40c99de1fd26f9ba6fae20a01175240b96fc7443.tar.gz art-40c99de1fd26f9ba6fae20a01175240b96fc7443.tar.bz2 | |
Merge "ART: Strip error message in run-test"
| -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 7b47ac1..57111bc 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 3d2b4f1..ed13662 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. |