Revert "Tweak check script in case logs interleave with Java prints."
This reverts commit 01f2e3a488fa06d98e2efbaf3ea8066d8457f216.
Reason for revert: Flaes in art-linux-bionic
Change-Id: I9dac6e516576f9f79b99e8bec7251f64bb6ffa24
diff --git a/test/719-dm-verify-redefinition/check b/test/719-dm-verify-redefinition/check
index 4a3e288..b10a0e2 100644
--- a/test/719-dm-verify-redefinition/check
+++ b/test/719-dm-verify-redefinition/check
@@ -16,10 +16,7 @@
# Search for the redefinition line and remove unnecessary tags.
sed -e 's/^dex2oat[d]\?\(\|32\|64\)\ W.*\] \(Fast verification failed: Class L[^;]*; redefines a class in the classpath\).*/\2/g' "$2" > "$2.tmp1"
-# Remove all other dex2oat/dalvikvm logs.
-sed 's/dex2oat.*//g' "$2.tmp1" > "$2.tmp2"
-sed 's/dalvikvm.*//g' "$2.tmp2" > "$2.tmp3"
-# Remove empty lines.
-sed '/^$/d' "$2.tmp3" > "$2.tmp4"
+# Remove all other dex2oat/dalvikvm log lines.
+grep -v dex2oat "$2.tmp1" | grep -v dalvikvm >> "$2.tmp2"
-./default-check "$1" "$2.tmp4"
+./default-check "$1" "$2.tmp2"
