compare.sh revision 1289:5a5a7a59ebdd
1#!/bin/bash 2# 3# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 4# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5# 6# This code is free software; you can redistribute it and/or modify it 7# under the terms of the GNU General Public License version 2 only, as 8# published by the Free Software Foundation. 9# 10# This code is distributed in the hope that it will be useful, but WITHOUT 11# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 12# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13# version 2 for more details (a copy is included in the LICENSE file that 14# accompanied this code). 15# 16# You should have received a copy of the GNU General Public License version 17# 2 along with this work; if not, write to the Free Software Foundation, 18# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 19# 20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21# or visit www.oracle.com if you need additional information or have any 22# questions. 23# 24 25# This script is processed by configure before it's usable. It is run from 26# the root of the build directory. 27 28 29########################################################################################## 30 31# Check that we are run via the wrapper generated by configure 32if [ -z "$SRC_ROOT" ]; then 33 echo "Error: You must run this script using build/[conf]/compare.sh" 34 exit 1 35fi 36 37if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 38 FULLDUMP_CMD="$OTOOL -v -V -h -X -t -d" 39 LDD_CMD="$OTOOL -L" 40 DIS_CMD="$OTOOL -v -t" 41 STAT_PRINT_SIZE="-f %z" 42elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then 43 FULLDUMP_CMD="$DUMPBIN -all" 44 LDD_CMD="$DUMPBIN -dependants | $GREP .dll" 45 DIS_CMD="$DUMPBIN -disasm:nobytes" 46 STAT_PRINT_SIZE="-c %s" 47else 48 FULLDUMP_CMD="$READELF -a" 49 LDD_CMD="$LDD" 50 DIS_CMD="$OBJDUMP -d" 51 STAT_PRINT_SIZE="-c %s" 52fi 53 54UNARCHIVE="$UNZIP -q" 55 56COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl" 57if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then 58 echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE" 59 exit 1 60fi 61# Include exception definitions 62. "$COMPARE_EXCEPTIONS_INCLUDE" 63 64########################################################################################## 65# Compare text files and ignore specific differences: 66# 67# * Timestamps in Java sources generated by idl2java 68# * Sorting order and cleanup style in .properties files 69 70diff_text() { 71 OTHER_FILE=$1 72 THIS_FILE=$2 73 74 SUFFIX="${THIS_FILE##*.}" 75 76 TMP=1 77 78 if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then 79 # Filter out date string, ant version and java version differences. 80 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 81 $GREP '^[<>]' | \ 82 $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \ 83 -e '/[<>] Created-By: .* (Oracle [Corpatin)]*/d' \ 84 -e '/[<>] [Corpatin]*)/d' \ 85 -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d') 86 fi 87 if test "x$SUFFIX" = "xjava"; then 88 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 89 $GREP '^[<>]' | \ 90 $SED -e '/[<>] \* from.*\.idl/d' \ 91 -e '/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 92 -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \ 93 -e '/\/\/ Generated from input file.*/d' \ 94 -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \ 95 -e '/\/\/ java GenerateCharacter.*/d') 96 fi 97 # Ignore date strings in class files. 98 # On Macosx the system sources for generated java classes produce different output on 99 # consequtive invocations seemingly randomly. 100 # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this. 101 # Anonymous lambda classes get randomly assigned counters in their names. 102 if test "x$SUFFIX" = "xclass"; then 103 # To improve performance when large diffs are found, do a rough filtering of classes 104 # elibeble for these exceptions 105 if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \ 106 -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \ 107 -e thePoint -e aPoint -e setItemsPtr \ 108 -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then 109 $JAVAP -c -constants -l -p "${OTHER_FILE}" > ${OTHER_FILE}.javap 110 $JAVAP -c -constants -l -p "${THIS_FILE}" > ${THIS_FILE}.javap 111 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \ 112 $GREP '^[<>]' | \ 113 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 114 -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \ 115 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \ 116 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \ 117 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d' \ 118 -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d') 119 fi 120 fi 121 if test "x$SUFFIX" = "xproperties"; then 122 # Run through nawk to add possibly missing newline at end of file. 123 $CAT $OTHER_FILE | $NAWK '{ print }' | LC_ALL=C $SORT > $OTHER_FILE.cleaned 124# Disable this exception since we aren't changing the properties cleaning method yet. 125# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ 126# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ 127# | $SED -e '/^#/d' -e '/^$/d' \ 128# -e :a -e '/\\$/N; s/\\\n//; ta' \ 129# -e 's/^[ \t]*//;s/[ \t]*$//' \ 130# -e 's/\\=/=/' | LC_ALL=C $SORT > $OTHER_FILE.cleaned 131 # Filter out date string differences. 132 TMP=$(LC_ALL=C $DIFF $OTHER_FILE.cleaned $THIS_FILE | \ 133 $GREP '^[<>]' | \ 134 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d') 135 fi 136 if test "x$SUFFIX" = "xhtml"; then 137 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \ 138 $GREP '^[<>]' | \ 139 $SED -e '/[<>] <!-- Generated by javadoc .* on .* -->/d' ) 140 fi 141 if test -n "$TMP"; then 142 echo Files $OTHER_FILE and $THIS_FILE differ 143 return 1 144 fi 145 146 return 0 147} 148 149########################################################################################## 150# Compare directory structure 151 152compare_dirs() { 153 THIS_DIR=$1 154 OTHER_DIR=$2 155 WORK_DIR=$3 156 157 mkdir -p $WORK_DIR 158 159 (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other) 160 (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this) 161 162 $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff 163 164 echo -n Directory structure... 165 if [ -s $WORK_DIR/dirs_diff ]; then 166 echo Differences found. 167 REGRESSIONS=true 168 # Differences in directories found. 169 ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff) 170 if [ "$ONLY_OTHER" ]; then 171 echo Only in $OTHER 172 $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./| |g' 173 fi 174 ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff) 175 if [ "$ONLY_THIS" ]; then 176 echo Only in $THIS 177 $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./| |g' 178 fi 179 else 180 echo Identical! 181 fi 182} 183 184 185########################################################################################## 186# Compare file structure 187 188compare_files() { 189 THIS_DIR=$1 190 OTHER_DIR=$2 191 WORK_DIR=$3 192 193 $MKDIR -p $WORK_DIR 194 195 (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other) 196 (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this) 197 198 $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff 199 200 echo -n File names... 201 if [ -s $WORK_DIR/files_diff ]; then 202 echo Differences found. 203 REGRESSIONS=true 204 # Differences in files found. 205 ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff) 206 if [ "$ONLY_OTHER" ]; then 207 echo Only in $OTHER 208 $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./| |g' 209 fi 210 ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff) 211 if [ "$ONLY_THIS" ]; then 212 echo Only in $THIS 213 $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./| |g' 214 fi 215 else 216 echo Identical! 217 fi 218} 219 220 221########################################################################################## 222# Compare permissions 223 224compare_permissions() { 225 THIS_DIR=$1 226 OTHER_DIR=$2 227 WORK_DIR=$3 228 229 mkdir -p $WORK_DIR 230 231 echo -n Permissions... 232 found="" 233 for f in `cd $OTHER_DIR && $FIND . -type f` 234 do 235 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi 236 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi 237 OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'` 238 TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'` 239 if [ "$OP" != "$TP" ] 240 then 241 if [ -z "$found" ]; then echo ; found="yes"; fi 242 $PRINTF "\tother: ${OP} this: ${TP}\t$f\n" 243 fi 244 done 245 if [ -z "$found" ]; then 246 echo "Identical!" 247 else 248 REGRESSIONS=true 249 fi 250} 251 252########################################################################################## 253# Compare file command output 254 255compare_file_types() { 256 THIS_DIR=$1 257 OTHER_DIR=$2 258 WORK_DIR=$3 259 260 $MKDIR -p $WORK_DIR 261 262 echo -n File types... 263 found="" 264 for f in `cd $OTHER_DIR && $FIND . ! -type d` 265 do 266 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi 267 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi 268 OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'` 269 TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'` 270 if [ "$OF" != "$TF" ] 271 then 272 if [ "`echo $OF | $GREP -c 'Zip archive data'`" -gt 0 ] \ 273 && [ "`echo $TF | $GREP -c 'Zip archive data'`" -gt 0 ] 274 then 275 # the way we produce zip-files make it so that directories are stored in 276 # old file but not in new (only files with full-path) this makes file 277 # report them as different 278 continue 279 else 280 if [ -z "$found" ]; then echo ; found="yes"; fi 281 $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n" 282 fi 283 fi 284 done 285 if [ -z "$found" ]; then 286 echo "Identical!" 287 else 288 REGRESSIONS=true 289 fi 290} 291 292########################################################################################## 293# Compare the rest of the files 294 295compare_general_files() { 296 THIS_DIR=$1 297 OTHER_DIR=$2 298 WORK_DIR=$3 299 300 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \ 301 ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" ! -name "*.jimage" \ 302 ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" ! -name "*.cpl" \ 303 ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \ 304 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \ 305 ! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" ! -name "JavaUpdater" \ 306 | $GREP -v "./bin/" | $SORT | $FILTER) 307 308 echo General files... 309 for f in $GENERAL_FILES 310 do 311 if [ -e $OTHER_DIR/$f ]; then 312 SUFFIX="${f##*.}" 313 if [ "$(basename $f)" = "release" ]; then 314 # Ignore differences in change numbers in release file. 315 OTHER_FILE=$WORK_DIR/$f.other 316 THIS_FILE=$WORK_DIR/$f.this 317 $MKDIR -p $(dirname $OTHER_FILE) 318 $MKDIR -p $(dirname $THIS_FILE) 319 $CAT $OTHER_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $OTHER_FILE 320 $CAT $THIS_DIR/$f | $SED 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' > $THIS_FILE 321 elif [ "x$SUFFIX" = "xhtml" ]; then 322 # Ignore time stamps in docs files 323 OTHER_FILE=$WORK_DIR/$f.other 324 THIS_FILE=$WORK_DIR/$f.this 325 $MKDIR -p $(dirname $OTHER_FILE) 326 $MKDIR -p $(dirname $THIS_FILE) 327 #Note that | doesn't work on mac sed. 328 $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 329 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 330 -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ 331 -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ 332 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 333 -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \ 334 > $OTHER_FILE 335 $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 336 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 337 -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ 338 -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ 339 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 340 -e 's/^\(.*\)\( o'"'"'clock \)\([A-Z][A-Z][A-Z]\)/(removed)\2(removed)/' \ 341 > $THIS_FILE 342 else 343 OTHER_FILE=$OTHER_DIR/$f 344 THIS_FILE=$THIS_DIR/$f 345 fi 346 DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1) 347 if [ -n "$DIFF_OUT" ]; then 348 echo $f 349 REGRESSIONS=true 350 if [ "$SHOW_DIFFS" = "true" ]; then 351 echo "$DIFF_OUT" 352 fi 353 fi 354 fi 355 done 356 357 358} 359 360########################################################################################## 361# Compare zip file 362 363compare_zip_file() { 364 THIS_DIR=$1 365 OTHER_DIR=$2 366 WORK_DIR=$3 367 ZIP_FILE=$4 368 # Optionally provide different name for other zipfile 369 OTHER_ZIP_FILE=$5 370 371 THIS_ZIP=$THIS_DIR/$ZIP_FILE 372 if [ -n "$OTHER_ZIP_FILE" ]; then 373 OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE 374 else 375 OTHER_ZIP=$OTHER_DIR/$ZIP_FILE 376 fi 377 378 THIS_SUFFIX="${THIS_ZIP##*.}" 379 OTHER_SUFFIX="${OTHER_ZIP##*.}" 380 if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then 381 echo "The files do not have the same suffix type! ($THIS_SUFFIX != $OTHER_SUFFIX)" 382 return 2 383 fi 384 385 TYPE="$THIS_SUFFIX" 386 387 if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null 388 then 389 return 0 390 fi 391 # Not quite identical, the might still contain the same data. 392 # Unpack the jar/zip files in temp dirs 393 394 THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this 395 OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other 396 $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR 397 $MKDIR -p $THIS_UNZIPDIR 398 $MKDIR -p $OTHER_UNZIPDIR 399 if [ "$TYPE" = "jimage" ] 400 then 401 (cd $THIS_UNZIPDIR && $JIMAGE extract $THIS_ZIP) 402 (cd $OTHER_UNZIPDIR && $JIMAGE extract $OTHER_ZIP) 403 else 404 (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP) 405 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) 406 fi 407 408 # Find all archives inside and unzip them as well to compare the contents rather than 409 # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it. 410 EXCEPTIONS="pie.jar.pack.gz" 411 for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 412 ($UNPACK200 $pack $pack.jar) 413 # Filter out the unzipped archives from the diff below. 414 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 415 done 416 for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 417 ($UNPACK200 $pack $pack.jar) 418 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 419 done 420 for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do 421 $MKDIR $zip.unzip 422 (cd $zip.unzip && $UNARCHIVE $zip) 423 EXCEPTIONS="$EXCEPTIONS $zip" 424 done 425 for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do 426 $MKDIR $zip.unzip 427 (cd $zip.unzip && $UNARCHIVE $zip) 428 EXCEPTIONS="$EXCEPTIONS $zip" 429 done 430 431 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff 432 # On solaris, there is no -q option. 433 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 434 LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \ 435 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \ 436 > $CONTENTS_DIFF_FILE 437 else 438 LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE 439 fi 440 441 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE) 442 ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE) 443 444 return_value=0 445 446 if [ -n "$ONLY_OTHER" ]; then 447 echo " Only OTHER $ZIP_FILE contains:" 448 echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g' 449 return_value=1 450 fi 451 452 if [ -n "$ONLY_THIS" ]; then 453 echo " Only THIS $ZIP_FILE contains:" 454 echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g' 455 return_value=1 456 fi 457 458 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 459 DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \ 460 | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") 461 else 462 DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \ 463 | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") 464 fi 465 466 $RM -f $WORK_DIR/$ZIP_FILE.diffs 467 for file in $DIFFING_FILES; do 468 if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then 469 diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs 470 fi 471 done 472 473 if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then 474 return_value=1 475 echo " Differing files in $ZIP_FILE" 476 $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \ 477 $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist 478 $CAT $WORK_DIR/$ZIP_FILE.difflist 479 480 if [ -n "$SHOW_DIFFS" ]; then 481 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do 482 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then 483 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap 484 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then 485 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i 486 else 487 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i 488 fi 489 done 490 fi 491 fi 492 493 return $return_value 494} 495 496 497########################################################################################## 498# Compare all zip files 499 500compare_all_zip_files() { 501 THIS_DIR=$1 502 OTHER_DIR=$2 503 WORK_DIR=$3 504 505 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER ) 506 507 if [ -n "$ZIPS" ]; then 508 echo Zip files... 509 510 return_value=0 511 for f in $ZIPS; do 512 if [ -f "$OTHER_DIR/$f" ]; then 513 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f 514 if [ "$?" != "0" ]; then 515 return_value=1 516 REGRESSIONS=true 517 fi 518 fi 519 done 520 fi 521 522 return $return_value 523} 524 525########################################################################################## 526# Compare all jar files 527 528compare_all_jar_files() { 529 THIS_DIR=$1 530 OTHER_DIR=$2 531 WORK_DIR=$3 532 533 # TODO filter? 534 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \ 535 -o -name "*.jimage" | $SORT | $FILTER) 536 537 if [ -n "$ZIPS" ]; then 538 echo Jar files... 539 540 return_value=0 541 for f in $ZIPS; do 542 if [ -f "$OTHER_DIR/$f" ]; then 543 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f 544 if [ "$?" != "0" ]; then 545 return_value=1 546 REGRESSIONS=true 547 fi 548 fi 549 done 550 fi 551 552 return $return_value 553} 554 555########################################################################################## 556# Compare binary (executable/library) file 557 558compare_bin_file() { 559 THIS_DIR=$1 560 OTHER_DIR=$2 561 WORK_DIR=$3 562 BIN_FILE=$4 563 OTHER_BIN_FILE=$5 564 565 THIS_FILE=$THIS_DIR/$BIN_FILE 566 if [ -n "$OTHER_BIN_FILE" ]; then 567 OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE 568 else 569 OTHER_FILE=$OTHER_DIR/$BIN_FILE 570 fi 571 NAME=$(basename $BIN_FILE) 572 WORK_FILE_BASE=$WORK_DIR/$BIN_FILE 573 FILE_WORK_DIR=$(dirname $WORK_FILE_BASE) 574 575 $MKDIR -p $FILE_WORK_DIR 576 577 # Make soft links to original files from work dir to facilitate debugging 578 $LN -f -s $THIS_FILE $WORK_FILE_BASE.this 579 $LN -f -s $OTHER_FILE $WORK_FILE_BASE.other 580 581 ORIG_THIS_FILE="$THIS_FILE" 582 ORIG_OTHER_FILE="$OTHER_FILE" 583 584 if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then 585 THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME 586 OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME 587 $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other 588 $CP $THIS_FILE $THIS_STRIPPED_FILE 589 $CP $OTHER_FILE $OTHER_STRIPPED_FILE 590 $STRIP $THIS_STRIPPED_FILE 591 $STRIP $OTHER_STRIPPED_FILE 592 THIS_FILE="$THIS_STRIPPED_FILE" 593 OTHER_FILE="$OTHER_STRIPPED_FILE" 594 fi 595 596 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 597 unset _NT_SYMBOL_PATH 598 # On windows we need to unzip the debug symbols, if present 599 OTHER_FILE_BASE=${OTHER_FILE/.dll/} 600 OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/} 601 OTHER_FILE_BASE=${OTHER_FILE_BASE/.cpl/} 602 DIZ_NAME=$(basename $OTHER_FILE_BASE).diz 603 # java.exe and java.dll diz files will have the same name. Have to 604 # make sure java.exe gets the right one. This is only needed for 605 # OTHER since in the new build, all pdb files are left around. 606 if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then 607 OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz" 608 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then 609 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz 610 else 611 # Some files, jli.dll, appears twice in the image but only one of 612 # thme has a diz file next to it. 613 OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)" 614 if [ ! -f "$OTHER_DIZ_FILE" ]; then 615 # As a last resort, look for diz file in the whole build output 616 # dir. 617 OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)" 618 fi 619 fi 620 if [ -n "$OTHER_DIZ_FILE" ]; then 621 $MKDIR -p $FILE_WORK_DIR/other 622 (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE) 623 export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other" 624 fi 625 THIS_FILE_BASE=${THIS_FILE/.dll/} 626 THIS_FILE_BASE=${THIS_FILE_BASE/.exe/} 627 if [ -f "${THIS_FILE/.dll/}.diz" ]; then 628 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz 629 else 630 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" 631 if [ ! -f "$THIS_DIZ_FILE" ]; then 632 # As a last resort, look for diz file in the whole build output 633 # dir. 634 THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)" 635 fi 636 fi 637 if [ -n "$THIS_DIZ_FILE" ]; then 638 $MKDIR -p $FILE_WORK_DIR/this 639 (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE) 640 export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this" 641 fi 642 fi 643 644 if [ -z "$SKIP_BIN_DIFF" ]; then 645 if cmp $OTHER_FILE $THIS_FILE > /dev/null; then 646 # The files were bytewise identical. 647 if [ -n "$VERBOSE" ]; then 648 echo " : : : : : : $BIN_FILE" 649 fi 650 return 0 651 fi 652 BIN_MSG=" diff " 653 if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then 654 DIFF_BIN=true 655 if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then 656 BIN_MSG="*$BIN_MSG*" 657 REGRESSIONS=true 658 else 659 BIN_MSG=" $BIN_MSG " 660 fi 661 else 662 BIN_MSG="($BIN_MSG)" 663 DIFF_BIN= 664 fi 665 fi 666 667 if [ -n "$STAT" ]; then 668 THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE") 669 OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE") 670 else 671 THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }') 672 OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }') 673 fi 674 if [ $THIS_SIZE -ne $OTHER_SIZE ]; then 675 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE) 676 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE) 677 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM) 678 if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \ 679 && [ "$DIFF_SIZE_REL" -lt 102 ]; then 680 SIZE_MSG="($SIZE_MSG)" 681 DIFF_SIZE= 682 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 683 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 684 && [ "$DIFF_SIZE_NUM" = 512 ]; then 685 # On windows, size of binaries increase in 512 increments. 686 SIZE_MSG="($SIZE_MSG)" 687 DIFF_SIZE= 688 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 689 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 690 && [ "$DIFF_SIZE_NUM" = -512 ]; then 691 # On windows, size of binaries increase in 512 increments. 692 SIZE_MSG="($SIZE_MSG)" 693 DIFF_SIZE= 694 else 695 if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 696 DIFF_SIZE=true 697 if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 698 SIZE_MSG="*$SIZE_MSG*" 699 REGRESSIONS=true 700 else 701 SIZE_MSG=" $SIZE_MSG " 702 fi 703 else 704 SIZE_MSG="($SIZE_MSG)" 705 DIFF_SIZE= 706 fi 707 fi 708 else 709 SIZE_MSG=" " 710 DIFF_SIZE= 711 if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then 712 SIZE_MSG=" ! " 713 fi 714 fi 715 716 if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then 717 SYM_SORT_CMD="sort" 718 else 719 SYM_SORT_CMD="cat" 720 fi 721 722 # Check symbols 723 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 724 # The output from dumpbin on windows differs depending on if the debug symbol 725 # files are still around at the location the binary is pointing too. Need 726 # to filter out that extra information. 727 $DUMPBIN -exports $OTHER_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other 728 $DUMPBIN -exports $THIS_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this 729 elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 730 # Some symbols get seemingly random 15 character prefixes. Filter them out. 731 $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other 732 $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this 733 else 734 $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other 735 $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this 736 fi 737 738 LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff 739 if [ -s $WORK_FILE_BASE.symbols.diff ]; then 740 SYM_MSG=" diff " 741 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then 742 DIFF_SYM=true 743 if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then 744 SYM_MSG="*$SYM_MSG*" 745 REGRESSIONS=true 746 else 747 SYM_MSG=" $SYM_MSG " 748 fi 749 else 750 SYM_MSG="($SYM_MSG)" 751 DIFF_SYM= 752 fi 753 else 754 SYM_MSG=" " 755 DIFF_SYM= 756 if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then 757 SYM_MSG=" ! " 758 fi 759 fi 760 761 # Check dependencies 762 if [ -n "$LDD_CMD" ]; then 763 (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq) 764 (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2</dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq) 765 (cd $FILE_WORK_DIR && $RM -f $NAME) 766 767 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff 768 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq 769 770 if [ -s $WORK_FILE_BASE.deps.diff ]; then 771 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then 772 DEP_MSG=" diff " 773 else 774 DEP_MSG=" redun " 775 fi 776 if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then 777 DIFF_DEP=true 778 if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then 779 DEP_MSG="*$DEP_MSG*" 780 REGRESSIONS=true 781 else 782 DEP_MSG=" $DEP_MSG " 783 fi 784 else 785 DEP_MSG="($DEP_MSG)" 786 DIFF_DEP= 787 fi 788 else 789 DEP_MSG=" " 790 DIFF_DEP= 791 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 792 DEP_MSG=" ! " 793 fi 794 fi 795 else 796 DEP_MSG=" - " 797 fi 798 799 # Compare fulldump output 800 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then 801 $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1 802 $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1 803 LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff 804 805 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then 806 ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}') 807 ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE) 808 if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then 809 DIFF_ELF=true 810 if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then 811 ELF_MSG="*$ELF_MSG*" 812 REGRESSIONS=true 813 else 814 ELF_MSG=" $ELF_MSG " 815 fi 816 else 817 ELF_MSG="($ELF_MSG)" 818 DIFF_ELF= 819 fi 820 else 821 ELF_MSG=" " 822 DIFF_ELF= 823 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 824 ELF_MSG=" ! " 825 fi 826 fi 827 fi 828 829 # Compare disassemble output 830 if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then 831 # By default we filter out differences that include references to symbols. 832 # To get a raw diff with the complete disassembly, set 833 # DIS_DIFF_FILTER="$CAT" 834 if [ -z "$DIS_DIFF_FILTER" ]; then 835 DIS_DIFF_FILTER="$GREP -v ' # .* <.*>$'" 836 fi 837 $DIS_CMD $OTHER_FILE | $GREP -v $NAME | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.other 2>&1 838 $DIS_CMD $THIS_FILE | $GREP -v $NAME | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.this 2>&1 839 840 LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff 841 842 if [ -s $WORK_FILE_BASE.dis.diff ]; then 843 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}') 844 DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE) 845 if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then 846 DIFF_DIS=true 847 if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then 848 DIS_MSG="*$DIS_MSG*" 849 REGRESSIONS=true 850 else 851 DIS_MSG=" $DIS_MSG " 852 fi 853 else 854 DIS_MSG="($DIS_MSG)" 855 DIFF_DIS= 856 fi 857 else 858 DIS_MSG=" " 859 DIFF_DIS= 860 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 861 DIS_MSG=" ! " 862 fi 863 fi 864 fi 865 866 867 if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then 868 if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi 869 if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi 870 if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi 871 if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi 872 if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi 873 if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi 874 echo " $BIN_FILE" 875 if [ "$SHOW_DIFFS" = "true" ]; then 876 if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then 877 echo "Symbols diff:" 878 $CAT $WORK_FILE_BASE.symbols.diff 879 fi 880 if [ -s "$WORK_FILE_BASE.deps.diff" ]; then 881 echo "Deps diff:" 882 $CAT $WORK_FILE_BASE.deps.diff 883 fi 884 if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then 885 echo "Fulldump diff:" 886 $CAT $WORK_FILE_BASE.fulldump.diff 887 fi 888 if [ -s "$WORK_FILE_BASE.dis.diff" ]; then 889 echo "Disassembly diff:" 890 $CAT $WORK_FILE_BASE.dis.diff 891 fi 892 fi 893 return 1 894 fi 895 return 0 896} 897 898########################################################################################## 899# Print binary diff header 900 901print_binary_diff_header() { 902 if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi 903 if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi 904 if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi 905 if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi 906 if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi 907 if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi 908 echo 909} 910 911########################################################################################## 912# Compare all libraries 913 914compare_all_libs() { 915 THIS_DIR=$1 916 OTHER_DIR=$2 917 WORK_DIR=$3 918 919 LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' \ 920 -o -name '*.dll' -o -name '*.obj' -o -name '*.o' \ 921 -o -name '*.cpl' \) | $SORT | $FILTER) 922 923 if [ -n "$LIBS" ]; then 924 echo Libraries... 925 print_binary_diff_header 926 for l in $LIBS; do 927 if [ -f "$OTHER_DIR/$l" ]; then 928 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l 929 if [ "$?" != "0" ]; then 930 return_value=1 931 fi 932 fi 933 done 934 fi 935 936 return $return_value 937} 938 939########################################################################################## 940# Compare all executables 941 942compare_all_execs() { 943 THIS_DIR=$1 944 OTHER_DIR=$2 945 WORK_DIR=$3 946 947 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 948 EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER) 949 else 950 EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \ 951 \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \ 952 -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \ 953 -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \ 954 -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \ 955 -o -name 'classlist' \) | $SORT | $FILTER) 956 fi 957 958 if [ -n "$EXECS" ]; then 959 echo Executables... 960 print_binary_diff_header 961 for e in $EXECS; do 962 if [ -f "$OTHER_DIR/$e" ]; then 963 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e 964 if [ "$?" != "0" ]; then 965 return_value=1 966 fi 967 fi 968 done 969 fi 970 971 return $return_value 972} 973 974########################################################################################## 975# Initiate configuration 976 977COMPARE_ROOT=/tmp/cimages.$USER 978$MKDIR -p $COMPARE_ROOT 979if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 980 if [ "$(uname -o)" = "Cygwin" ]; then 981 COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT) 982 fi 983fi 984 985THIS="$( cd "$( dirname "$0" )" && pwd )" 986echo "$THIS" 987THIS_SCRIPT="$0" 988 989if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then 990 echo "bash ./compare.sh [OPTIONS] [FILTER]" 991 echo "" 992 echo "-all Compare all files in all known ways" 993 echo "-names Compare the file names and directory structure" 994 echo "-perms Compare the permission bits on all files and directories" 995 echo "-types Compare the output of the file command on all files" 996 echo "-general Compare the files not convered by the specialized comparisons" 997 echo "-zips Compare the contents of all zip files" 998 echo "-jars Compare the contents of all jar files" 999 echo "-libs Compare all native libraries" 1000 echo "-execs Compare all executables" 1001 echo "-v Verbose output, does not hide known differences" 1002 echo "-vv More verbose output, shows diff output of all comparisons" 1003 echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory" 1004 echo "" 1005 echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs" 1006 echo "Example:" 1007 echo "bash ./common/bin/compareimages.sh CodePointIM.jar" 1008 echo "" 1009 echo "-2zips <file1> <file2> Compare two zip files only" 1010 echo "-2bins <file1> <file2> Compare two binary files only" 1011 echo "-2dirs <dir1> <dir2> Compare two directories as if they were images" 1012 echo "" 1013 exit 10 1014fi 1015 1016CMP_NAMES=false 1017CMP_PERMS=false 1018CMP_TYPES=false 1019CMP_GENERAL=false 1020CMP_ZIPS=false 1021CMP_JARS=false 1022CMP_LIBS=false 1023CMP_EXECS=false 1024 1025while [ -n "$1" ]; do 1026 case "$1" in 1027 -v) 1028 VERBOSE=true 1029 ;; 1030 -vv) 1031 VERBOSE=true 1032 SHOW_DIFFS=true 1033 ;; 1034 -o) 1035 OTHER="$2" 1036 shift 1037 ;; 1038 -all) 1039 CMP_NAMES=true 1040 if [ "$OPENJDK_TARGET_OS" != "windows" ]; then 1041 CMP_PERMS=true 1042 fi 1043 CMP_TYPES=true 1044 CMP_GENERAL=true 1045 CMP_ZIPS=true 1046 CMP_JARS=true 1047 CMP_LIBS=true 1048 CMP_EXECS=true 1049 ;; 1050 -names) 1051 CMP_NAMES=true 1052 ;; 1053 -perms) 1054 CMP_PERMS=true 1055 ;; 1056 -types) 1057 CMP_TYPES=true 1058 ;; 1059 -general) 1060 CMP_GENERAL=true 1061 ;; 1062 -zips) 1063 CMP_ZIPS=true 1064 ;; 1065 -jars) 1066 CMP_JARS=true 1067 ;; 1068 -libs) 1069 CMP_LIBS=true 1070 ;; 1071 -execs) 1072 CMP_EXECS=true 1073 ;; 1074 -2dirs) 1075 THIS="$(cd "$2" && pwd )" 1076 OTHER="$(cd "$3" && pwd )" 1077 THIS_BASE_DIR="$THIS" 1078 OTHER_BASE_DIR="$OTHER" 1079 SKIP_DEFAULT=true 1080 shift 1081 shift 1082 ;; 1083 -2zips) 1084 CMP_2_ZIPS=true 1085 THIS_FILE=$2 1086 OTHER_FILE=$3 1087 shift 1088 shift 1089 ;; 1090 -2bins) 1091 CMP_2_BINS=true 1092 THIS_FILE=$2 1093 OTHER_FILE=$3 1094 shift 1095 shift 1096 ;; 1097 *) 1098 CMP_NAMES=false 1099 CMP_PERMS=false 1100 CMP_TYPES=false 1101 CMP_ZIPS=true 1102 CMP_JARS=true 1103 CMP_LIBS=true 1104 CMP_EXECS=true 1105 1106 if [ -z "$FILTER" ]; then 1107 FILTER="$GREP" 1108 fi 1109 FILTER="$FILTER -e $1" 1110 ;; 1111 esac 1112 shift 1113done 1114 1115if [ "$CMP_2_ZIPS" = "true" ]; then 1116 THIS_DIR="$(dirname $THIS_FILE)" 1117 THIS_DIR="$(cd "$THIS_DIR" && pwd )" 1118 OTHER_DIR="$(dirname $OTHER_FILE)" 1119 OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 1120 THIS_FILE_NAME="$(basename $THIS_FILE)" 1121 OTHER_FILE_NAME="$(basename $OTHER_FILE)" 1122 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 1123 compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME 1124 exit 1125fi 1126 1127if [ "$CMP_2_BINS" = "true" ]; then 1128 THIS_DIR="$(dirname $THIS_FILE)" 1129 THIS_DIR="$(cd "$THIS_DIR" && pwd )" 1130 OTHER_DIR="$(dirname $OTHER_FILE)" 1131 OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 1132 THIS_FILE_NAME="$(basename $THIS_FILE)" 1133 OTHER_FILE_NAME="$(basename $OTHER_FILE)" 1134 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 1135 compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME 1136 exit 1137fi 1138 1139if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then 1140 CMP_NAMES=true 1141 CMP_PERMS=true 1142 CMP_TYPES=true 1143 CMP_GENERAL=true 1144 CMP_ZIPS=true 1145 CMP_JARS=true 1146 CMP_LIBS=true 1147 CMP_EXECS=true 1148fi 1149 1150if [ -z "$FILTER" ]; then 1151 FILTER="$CAT" 1152fi 1153 1154if [ "$SKIP_DEFAULT" != "true" ]; then 1155 if [ -z "$OTHER" ]; then 1156 echo "Nothing to compare to, set with -o" 1157 exit 1 1158 else 1159 if [ ! -d "$OTHER" ]; then 1160 echo "Other build directory does not exist:" 1161 echo "$OTHER" 1162 exit 1 1163 fi 1164 OTHER="$( cd "$OTHER" && pwd )" 1165 echo "Comparing to:" 1166 echo "$OTHER" 1167 echo 1168 fi 1169 1170 1171 # Find the common images to compare, prioritizing later build stages 1172 if [ -d "$THIS/install/jdk" ] && [ -d "$OTHER/install/jdk" ]; then 1173 THIS_J2SDK="$THIS/install/jdk" 1174 THIS_J2RE="$THIS/install/jre" 1175 OTHER_J2SDK="$OTHER/install/jdk" 1176 OTHER_J2RE="$OTHER/install/jre" 1177 echo "Selecting install images for compare" 1178 elif [ -d "$THIS/deploy/jdk" ] && [ -d "$OTHER/deploy/jdk" ]; then 1179 THIS_J2SDK="$THIS/deploy/jdk" 1180 THIS_J2RE="$THIS/deploy/jre" 1181 OTHER_J2SDK="$OTHER/deploy/jdk" 1182 OTHER_J2RE="$OTHER/deploy/jre" 1183 echo "Selecting deploy images for compare" 1184 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then 1185 THIS_J2SDK="$THIS/images/jdk" 1186 THIS_J2RE="$THIS/images/jre" 1187 OTHER_J2SDK="$OTHER/images/jdk" 1188 OTHER_J2RE="$OTHER/images/jre" 1189 echo "Selecting jdk images for compare" 1190 else 1191 echo "No common images found." 1192 exit 1 1193 fi 1194 1195 if [ -d "$THIS/images/jdk-bundle" ] && [ -d "$OTHER/images/jdk-bundle" ]; then 1196 THIS_J2SDK_BUNDLE="$THIS/images/jdk-bundle" 1197 THIS_J2RE_BUNDLE="$THIS/images/jre-bundle" 1198 OTHER_J2SDK_BUNDLE="$OTHER/images/jdk-bundle" 1199 OTHER_J2RE_BUNDLE="$OTHER/images/jre-bundle" 1200 echo "Also comparing macosx bundles" 1201 fi 1202 1203 if [ -d "$THIS/deploy" ] && [ -d "$OTHER/deploy" ]; then 1204 THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/dist/installer/bundles" 1205 OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles" 1206 echo "Also comparing deploy/bundles" 1207 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1208 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/JavaAppletPlugin.plugin" 1209 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/JavaAppletPlugin.plugin" 1210 echo "Also comparing JavaAppletPlugin" 1211 fi 1212 fi 1213 1214 if [ -d "$OTHER/images" ]; then 1215 OTHER_SEC_DIR="$OTHER/images" 1216 else 1217 OTHER_SEC_DIR="$OTHER/tmp" 1218 fi 1219 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" 1220 THIS_SEC_DIR="$THIS/images" 1221 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" 1222 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 1223 if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then 1224 JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" 1225 else 1226 JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" 1227 fi 1228 OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" 1229 OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" 1230 THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" 1231 THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" 1232 fi 1233 1234 if [ -d "$THIS/docs" ] && [ -d "$OTHER/docs" ]; then 1235 THIS_DOCS="$THIS/docs" 1236 OTHER_DOCS="$OTHER/docs" 1237 echo "Also comparing docs" 1238 else 1239 echo "WARNING! Docs haven't been built and won't be compared." 1240 fi 1241fi 1242 1243########################################################################################## 1244# Do the work 1245 1246if [ "$CMP_NAMES" = "true" ]; then 1247 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1248 echo -n "J2SDK " 1249 compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1250 echo -n "J2RE " 1251 compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1252 1253 echo -n "J2SDK " 1254 compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1255 echo -n "J2RE " 1256 compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1257 fi 1258 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1259 echo -n "J2SDK Bundle " 1260 compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1261 echo -n "J2RE Bundle " 1262 compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1263 1264 echo -n "J2SDK Bundle " 1265 compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1266 echo -n "J2RE Bundle " 1267 compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1268 fi 1269 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then 1270 echo -n "Docs " 1271 compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1272 echo -n "Docs " 1273 compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1274 fi 1275 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1276 compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1277 compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1278 fi 1279 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1280 echo -n "JavaAppletPlugin " 1281 compare_dirs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1282 echo -n "JavaAppletPlugin " 1283 compare_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1284 fi 1285fi 1286 1287if [ "$CMP_PERMS" = "true" ]; then 1288 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1289 echo -n "J2SDK " 1290 compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1291 echo -n "J2RE " 1292 compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1293 fi 1294 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1295 compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1296 fi 1297 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1298 echo -n "JavaAppletPlugin " 1299 compare_permissions $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1300 fi 1301fi 1302 1303if [ "$CMP_TYPES" = "true" ]; then 1304 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1305 echo -n "J2SDK " 1306 compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1307 echo -n "J2RE " 1308 compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1309 fi 1310 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1311 echo -n "J2SDK Bundle " 1312 compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1313 echo -n "J2RE Bundle " 1314 compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1315 fi 1316 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1317 compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1318 fi 1319 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1320 echo -n "JavaAppletPlugin " 1321 compare_file_types $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1322 fi 1323fi 1324 1325if [ "$CMP_GENERAL" = "true" ]; then 1326 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1327 echo -n "J2SDK " 1328 compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1329 echo -n "J2RE " 1330 compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1331 fi 1332 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1333 echo -n "J2SDK Bundle " 1334 compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/jdk-bundle 1335 echo -n "J2RE Bundle " 1336 compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/jre-bundle 1337 fi 1338 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then 1339 echo -n "Docs " 1340 compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1341 fi 1342 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1343 compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1344 fi 1345 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1346 echo -n "JavaAppletPlugin " 1347 compare_general_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1348 fi 1349fi 1350 1351if [ "$CMP_ZIPS" = "true" ]; then 1352 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1353 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1354 fi 1355 if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then 1356 if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then 1357 echo "sec-bin.zip..." 1358 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip 1359 fi 1360 fi 1361 if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then 1362 if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then 1363 echo "sec-windows-bin.zip..." 1364 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip 1365 fi 1366 fi 1367 if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then 1368 if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then 1369 echo "$JGSS_WINDOWS_BIN..." 1370 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN 1371 fi 1372 fi 1373 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1374 compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1375 fi 1376 if [ -n "$THIS_DEPLOY_BUNDLE_DIR" ] && [ -n "$OTHER_DEPLOY_BUNDLE_DIR" ]; then 1377 compare_all_zip_files $THIS_DEPLOY_BUNDLE_DIR $OTHER_DEPLOY_BUNDLE_DIR $COMPARE_ROOT/deploy-bundle 1378 fi 1379 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1380 compare_all_zip_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1381 fi 1382fi 1383 1384if [ "$CMP_JARS" = "true" ]; then 1385 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1386 compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1387 fi 1388 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1389 compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1390 fi 1391 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1392 compare_all_jar_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1393 fi 1394fi 1395 1396if [ "$CMP_LIBS" = "true" ]; then 1397 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1398 echo -n "J2SDK " 1399 compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1400 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1401 echo -n "J2RE " 1402 compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1403 fi 1404 fi 1405 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1406 compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1407 fi 1408 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1409 echo -n "JavaAppletPlugin " 1410 compare_all_libs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1411 fi 1412fi 1413 1414if [ "$CMP_EXECS" = "true" ]; then 1415 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1416 compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1417 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1418 echo -n "J2RE " 1419 compare_all_execs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1420 fi 1421 fi 1422 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1423 compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1424 fi 1425 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1426 echo -n "JavaAppletPlugin " 1427 compare_all_execs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1428 fi 1429fi 1430 1431echo 1432 1433if [ -n "$REGRESSIONS" ]; then 1434 echo "REGRESSIONS FOUND!" 1435 echo 1436 exit 1 1437else 1438 echo "No regressions found" 1439 echo 1440 exit 0 1441fi 1442