changeset 2335:55d7c3a0eb5e

Adjusted compare exceptions for linux arm minimal jvm
author erikj
date Thu, 17 Mar 2016 10:48:11 +0100
parents 2380bdba9bb3
children b1106c132c82
files common/bin/compare.sh common/bin/compare_exceptions.sh.incl
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/common/bin/compare.sh	Thu Mar 17 10:22:51 2016 +0100
+++ b/common/bin/compare.sh	Thu Mar 17 10:48:11 2016 +0100
@@ -877,11 +877,12 @@
 
     # Compare disassemble output
     if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then
-        if [ -n "$DIS_DIFF_FILTER" ] && [ -z "$NEED_DIS_DIFF_FILTER" ] \
+        this_DIS_DIFF_FILTER="$CAT"
+        if [ -n "$DIS_DIFF_FILTER" ]; then
+            if [ -z "$NEED_DIS_DIFF_FILTER" ] \
                 || [[ "$NEED_DIS_DIFF_FILTER" = *"$BIN_FILE"* ]]; then
-            this_DIS_DIFF_FILTER="$DIS_DIFF_FILTER"
-        else
-            this_DIS_DIFF_FILTER="$CAT"
+                this_DIS_DIFF_FILTER="$DIS_DIFF_FILTER"
+            fi
         fi
         if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
             DIS_GREP_ARG=-a
--- a/common/bin/compare_exceptions.sh.incl	Thu Mar 17 10:22:51 2016 +0100
+++ b/common/bin/compare_exceptions.sh.incl	Thu Mar 17 10:48:11 2016 +0100
@@ -128,12 +128,14 @@
         ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
         "
     DIS_DIFF_FILTER="$SED -r \
-        -e 's/\.[0-9]+/.X/g'
+        -e 's/\.[0-9]+/.X/g' \
+        -e 's/\t[0-9a-f]{4} [0-9a-f]{4} /\tXXXX XXXX /' \
+        -e 's/\t[0-9a-f]{5,} /\t<HEX> /' \
         "
     KNOWN_DIS_DIFF="
         ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
         "
-    MAX_KNOWN_DIS_DIFF_SIZE="2000"
+    MAX_KNOWN_DIS_DIFF_SIZE="3000"
 
     NEED_SYMBOLS_DIFF_FILTER="
         ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so