common/bin/compare_exceptions.sh.incl
changeset 34596 e8328ce5b64e
parent 32171 20aeca84739b
child 35744 4f5e0998b6e9
equal deleted inserted replaced
34595:09596fe63e2d 34596:e8328ce5b64e
    55 ./demo/jvmti/heapViewer/lib/libheapViewer.so
    55 ./demo/jvmti/heapViewer/lib/libheapViewer.so
    56 ./demo/jvmti/minst/lib/libminst.so
    56 ./demo/jvmti/minst/lib/libminst.so
    57 ./demo/jvmti/mtrace/lib/libmtrace.so
    57 ./demo/jvmti/mtrace/lib/libmtrace.so
    58 ./demo/jvmti/versionCheck/lib/libversionCheck.so
    58 ./demo/jvmti/versionCheck/lib/libversionCheck.so
    59 ./demo/jvmti/waiters/lib/libwaiters.so
    59 ./demo/jvmti/waiters/lib/libwaiters.so
       
    60 ./lib/i386/client/libjsig.so
    60 ./lib/i386/client/libjvm.so
    61 ./lib/i386/client/libjvm.so
    61 ./lib/i386/libattach.so
    62 ./lib/i386/libattach.so
    62 ./lib/i386/libdt_socket.so
    63 ./lib/i386/libdt_socket.so
    63 ./lib/i386/libinstrument.so
    64 ./lib/i386/libinstrument.so
    64 ./lib/i386/libjsdt.so
    65 ./lib/i386/libjsdt.so
       
    66 ./lib/i386/libjsig.so
    65 ./lib/i386/libmanagement.so
    67 ./lib/i386/libmanagement.so
       
    68 ./lib/i386/libnet.so
    66 ./lib/i386/libnpt.so
    69 ./lib/i386/libnpt.so
    67 ./lib/i386/libverify.so
    70 ./lib/i386/libverify.so
       
    71 ./lib/i386/server/libjsig.so
    68 ./lib/i386/server/libjvm.so
    72 ./lib/i386/server/libjvm.so
    69 ./bin/appletviewer
    73 ./bin/appletviewer
    70 ./bin/idlj
    74 ./bin/idlj
    71 ./bin/jar
    75 ./bin/jar
    72 ./bin/jarsigner
    76 ./bin/jarsigner
   103 ./bin/wsgen
   107 ./bin/wsgen
   104 ./bin/wsimport
   108 ./bin/wsimport
   105 ./bin/xjc
   109 ./bin/xjc
   106 "
   110 "
   107 
   111 
       
   112 # Issue with __FILE__ usage in generated header files prevent clean fulldump diff of
       
   113 # server jvm with old hotspot build.
       
   114 KNOWN_FULLDUMP_DIFF="
       
   115 ./lib/i386/server/libjvm.so
       
   116 "
       
   117 KNOWN_DIS_DIFF="
       
   118 ./lib/i386/server/libjvm.so
       
   119 "
       
   120 DIS_DIFF_FILTER="$SED \
       
   121   -e 's/\(:\t\)\([0-9a-z]\{2,2\} \)\{1,7\}/\1<hex>/g' \
       
   122   -e 's/0x[0-9a-z]\{2,9\}/<hex>/g'"
   108 fi
   123 fi
   109 
   124 
   110 if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
   125 if [ "$OPENJDK_TARGET_OS" = "linux" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
   111 
   126 
   112 STRIP_BEFORE_COMPARE="
   127 STRIP_BEFORE_COMPARE="
   133 ./lib/amd64/libdt_socket.so
   148 ./lib/amd64/libdt_socket.so
   134 ./lib/amd64/libinstrument.so
   149 ./lib/amd64/libinstrument.so
   135 ./lib/amd64/libjsdt.so
   150 ./lib/amd64/libjsdt.so
   136 ./lib/amd64/libjsig.so
   151 ./lib/amd64/libjsig.so
   137 ./lib/amd64/libmanagement.so
   152 ./lib/amd64/libmanagement.so
       
   153 ./lib/amd64/libnet.so
   138 ./lib/amd64/libnpt.so
   154 ./lib/amd64/libnpt.so
   139 ./lib/amd64/libsaproc.so
   155 ./lib/amd64/libsaproc.so
   140 ./lib/amd64/libverify.so
   156 ./lib/amd64/libverify.so
   141 ./lib/amd64/server/libjsig.so
   157 ./lib/amd64/server/libjsig.so
   142 ./lib/amd64/server/libjvm.so
   158 ./lib/amd64/server/libjvm.so
   175 ./bin/servertool
   191 ./bin/servertool
   176 ./bin/tnameserv
   192 ./bin/tnameserv
   177 ./bin/wsgen
   193 ./bin/wsgen
   178 ./bin/wsimport
   194 ./bin/wsimport
   179 ./bin/xjc
   195 ./bin/xjc
       
   196 "
       
   197 
       
   198 # Issue with __FILE__ usage in generated header files prevent clean fulldump diff of
       
   199 # server jvm with old hotspot build.
       
   200 KNOWN_FULLDUMP_DIFF="
       
   201 ./lib/amd64/server/libjvm.so
   180 "
   202 "
   181 
   203 
   182 fi
   204 fi
   183 
   205 
   184 if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
   206 if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
   297 
   319 
   298 SKIP_FULLDUMP_DIFF="true"
   320 SKIP_FULLDUMP_DIFF="true"
   299 
   321 
   300 # Filter random C++ symbol strings.
   322 # Filter random C++ symbol strings.
   301 # Some numbers differ randomly.
   323 # Some numbers differ randomly.
   302 # Can't use space in these expressions as the shell will mess with them.
       
   303 DIS_DIFF_FILTER="$SED \
   324 DIS_DIFF_FILTER="$SED \
   304     -e 's/\.[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g' \
   325     -e 's/\.[a-zA-Z0-9_\$]\{15\}/<SYM>/g' \
   305     -e 's/\([0-9a-f][0-9a-f].\)\{2,8\}[0-9a-f][0-9a-f]/<NUMS>/g' \
   326     -e 's/\(\# \)[0-9a-f]*\( <\)/\1<HEX>\2/g' \
   306     -e 's/\(0x\)[0-9a-f]*\([,(>]\)/\1<HEX>\2/g' \
   327     -e 's/0x[0-9a-f]*$/<HEX>/g' \
   307     -e 's/\(0x\)[0-9a-f]*$/\1<HEX>/g' \
   328     -e 's/0x[0-9a-f]*\([,(>]\)/<HEX>\1/g' \
   308     -e 's/\(\#.\)[0-9a-f]*\(.<\)/\1<HEX>\2/g' \
   329     -e 's/:	[0-9a-f][0-9a-f]\( [0-9a-f][0-9a-f]\)\{2,10\}/:	<NUMS>/g' \
   309     -e 's/[\.A-Za-z0-9%]\{16,16\}$/<BIN>/g'"
   330     -e 's/     [\.A-Za-z0-9%@]\{16\}$/     <BIN>/g'"
   310 
   331 
   311 fi
   332 fi
   312 
   333 
   313 if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]; then
   334 if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]; then
   314 
   335 
   423 ./bin/wsgen
   444 ./bin/wsgen
   424 ./bin/wsimport
   445 ./bin/wsimport
   425 ./bin/xjc
   446 ./bin/xjc
   426 "
   447 "
   427 
   448 
   428 # Filter random C++ symbol strings.
       
   429 # Some numbers differ randomly.
   449 # Some numbers differ randomly.
   430 DIS_DIFF_FILTER="$SED \
   450 DIS_DIFF_FILTER="$SED \
   431     -e 's/\$[a-zA-Z0-9_\$]\{15,15\}/<SYM>/g' \
   451     -e 's/\$[a-zA-Z0-9_\$]\{15\}/<SYM>/g' \
   432     -e 's/[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f].[0-9a-f][0-9a-f]/<NUMS>/g' \
   452     -e 's/:	[0-9a-f][0-9a-f]\( [0-9a-f][0-9a-f]\)\{2,10\}/:	<NUMS>/g' \
   433     -e 's/\(%g1,.0x\)[0-9a-f]*\(,.%g1\)/\1<HEX>\2/g' \
   453     -e 's/, [0-9a-fx\-]\{1,8\}/, <CONST>/g' \
   434     -e 's/\(!.\)[0-9a-f]*\(.<SUNWprivate_1.1+0x\)[0-9a-f]*/\1<NUM>\2<HEX>/g' \
   454     -e 's/call  [0-9a-f]\{7\}/call  <ADDR>/g' \
   435     -e 's/\!.[0-9a-f]\{1,4\} <_DYNAMIC+0x[0-9a-f]\{1,4\}>/<DYNAMIC>/g'"
   455     -e 's/0x[0-9a-f]\{1,8\}/<HEX>/g' \
   436 
   456     -e 's/\! [0-9a-f]\{1,8\} /! <ADDR> /g'"
   437 # Some xor instructions end up with different args in the lib but not in the object files.
   457 
   438 ACCEPTED_DIS_DIFF="
   458 # libjvm.so
   439 ./demo/jvmti/waiters/lib/libwaiters.so
   459 # __FILE__ macro usage in debug.hpp causes differences between old and new
       
   460 # hotspot builds in ad_sparc.o and ad_sparc_clone.o. The .o files compare
       
   461 # equal when stripped, but at link time differences appear. Removing
       
   462 # __FILE__ from ShouldNotCallThis() and ShouldNotReachHere() removes
       
   463 # the differences.
       
   464 KNOWN_DIS_DIFF="
       
   465 ./lib/sparcv9/server/libjvm.so
   440 "
   466 "
   441 
   467 
   442 SKIP_FULLDUMP_DIFF="true"
   468 SKIP_FULLDUMP_DIFF="true"
   443 
   469 
   444 fi
   470 fi
   632 "
   658 "
   633 
   659 
   634 SORT_SYMBOLS="
   660 SORT_SYMBOLS="
   635 ./Contents/Home/lib/libsaproc.dylib
   661 ./Contents/Home/lib/libsaproc.dylib
   636 ./lib/libsaproc.dylib
   662 ./lib/libsaproc.dylib
       
   663 ./lib/libjsig.dylib
   637 "
   664 "
   638 
   665 
   639 ACCEPTED_SMALL_SIZE_DIFF="$ACCEPTED_BIN_DIFF"
   666 ACCEPTED_SMALL_SIZE_DIFF="$ACCEPTED_BIN_DIFF"
   640 
   667 
   641 DIS_DIFF_FILTER="$SED \
   668 DIS_DIFF_FILTER="LANG=C $SED \
   642     -e 's/0x[0-9a-f]\{4,16\}/<HEXSTR>/g'"
   669     -e 's/0x[0-9a-f]\{3,16\}/<HEXSTR>/g' -e 's/^[0-9a-f]\{12,20\}/<ADDR>/'"
   643 
   670 
   644 fi
   671 fi