compare.sh revision 1236:bebfcf0b68ea
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" \ 302 ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" ! -name "*.cpl" \ 303 ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \ 304 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" ! -name "*.jmod" \ 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 (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP) 400 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) 401 402 # Find all archives inside and unzip them as well to compare the contents rather than 403 # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it. 404 EXCEPTIONS="pie.jar.pack.gz" 405 for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 406 ($UNPACK200 $pack $pack.jar) 407 # Filter out the unzipped archives from the diff below. 408 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 409 done 410 for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 411 ($UNPACK200 $pack $pack.jar) 412 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 413 done 414 for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do 415 $MKDIR $zip.unzip 416 (cd $zip.unzip && $UNARCHIVE $zip) 417 EXCEPTIONS="$EXCEPTIONS $zip" 418 done 419 for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do 420 $MKDIR $zip.unzip 421 (cd $zip.unzip && $UNARCHIVE $zip) 422 EXCEPTIONS="$EXCEPTIONS $zip" 423 done 424 425 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff 426 # On solaris, there is no -q option. 427 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 428 LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \ 429 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \ 430 > $CONTENTS_DIFF_FILE 431 else 432 LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE 433 fi 434 435 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE) 436 ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE) 437 438 return_value=0 439 440 if [ -n "$ONLY_OTHER" ]; then 441 echo " Only OTHER $ZIP_FILE contains:" 442 echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g' 443 return_value=1 444 fi 445 446 if [ -n "$ONLY_THIS" ]; then 447 echo " Only THIS $ZIP_FILE contains:" 448 echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g' 449 return_value=1 450 fi 451 452 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 453 DIFFING_FILES=$($GREP -e "differ$" -e "^diff " $CONTENTS_DIFF_FILE \ 454 | $CUT -f 3 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") 455 else 456 DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \ 457 | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") 458 fi 459 460 $RM -f $WORK_DIR/$ZIP_FILE.diffs 461 for file in $DIFFING_FILES; do 462 if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then 463 diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs 464 fi 465 done 466 467 if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then 468 return_value=1 469 echo " Differing files in $ZIP_FILE" 470 $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP differ | cut -f 2 -d ' ' | \ 471 $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist 472 $CAT $WORK_DIR/$ZIP_FILE.difflist 473 474 if [ -n "$SHOW_DIFFS" ]; then 475 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do 476 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then 477 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap 478 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then 479 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i 480 else 481 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i 482 fi 483 done 484 fi 485 fi 486 487 return $return_value 488} 489 490 491########################################################################################## 492# Compare all zip files 493 494compare_all_zip_files() { 495 THIS_DIR=$1 496 OTHER_DIR=$2 497 WORK_DIR=$3 498 499 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER ) 500 501 if [ -n "$ZIPS" ]; then 502 echo Zip files... 503 504 return_value=0 505 for f in $ZIPS; do 506 if [ -f "$OTHER_DIR/$f" ]; then 507 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f 508 if [ "$?" != "0" ]; then 509 return_value=1 510 REGRESSIONS=true 511 fi 512 fi 513 done 514 fi 515 516 return $return_value 517} 518 519########################################################################################## 520# Compare all jar files 521 522compare_all_jar_files() { 523 THIS_DIR=$1 524 OTHER_DIR=$2 525 WORK_DIR=$3 526 527 # TODO filter? 528 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \ 529 | $SORT | $FILTER) 530 531 if [ -n "$ZIPS" ]; then 532 echo Jar files... 533 534 return_value=0 535 for f in $ZIPS; do 536 if [ -f "$OTHER_DIR/$f" ]; then 537 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f 538 if [ "$?" != "0" ]; then 539 return_value=1 540 REGRESSIONS=true 541 fi 542 fi 543 done 544 fi 545 546 return $return_value 547} 548 549########################################################################################## 550# Compare binary (executable/library) file 551 552compare_bin_file() { 553 THIS_DIR=$1 554 OTHER_DIR=$2 555 WORK_DIR=$3 556 BIN_FILE=$4 557 OTHER_BIN_FILE=$5 558 559 THIS_FILE=$THIS_DIR/$BIN_FILE 560 if [ -n "$OTHER_BIN_FILE" ]; then 561 OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE 562 else 563 OTHER_FILE=$OTHER_DIR/$BIN_FILE 564 fi 565 NAME=$(basename $BIN_FILE) 566 WORK_FILE_BASE=$WORK_DIR/$BIN_FILE 567 FILE_WORK_DIR=$(dirname $WORK_FILE_BASE) 568 569 $MKDIR -p $FILE_WORK_DIR 570 571 # Make soft links to original files from work dir to facilitate debugging 572 $LN -f -s $THIS_FILE $WORK_FILE_BASE.this 573 $LN -f -s $OTHER_FILE $WORK_FILE_BASE.other 574 575 ORIG_THIS_FILE="$THIS_FILE" 576 ORIG_OTHER_FILE="$OTHER_FILE" 577 578 if [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then 579 THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME 580 OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME 581 $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other 582 $CP $THIS_FILE $THIS_STRIPPED_FILE 583 $CP $OTHER_FILE $OTHER_STRIPPED_FILE 584 $STRIP $THIS_STRIPPED_FILE 585 $STRIP $OTHER_STRIPPED_FILE 586 THIS_FILE="$THIS_STRIPPED_FILE" 587 OTHER_FILE="$OTHER_STRIPPED_FILE" 588 fi 589 590 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 591 unset _NT_SYMBOL_PATH 592 # On windows we need to unzip the debug symbols, if present 593 OTHER_FILE_BASE=${OTHER_FILE/.dll/} 594 OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/} 595 OTHER_FILE_BASE=${OTHER_FILE_BASE/.cpl/} 596 DIZ_NAME=$(basename $OTHER_FILE_BASE).diz 597 # java.exe and java.dll diz files will have the same name. Have to 598 # make sure java.exe gets the right one. This is only needed for 599 # OTHER since in the new build, all pdb files are left around. 600 if [ "$NAME" = "java.exe" ] && [ -f "$OTHER/tmp/java/java/obj64/java.diz" ]; then 601 OTHER_DIZ_FILE="$OTHER/tmp/java/java/obj64/java.diz" 602 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then 603 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz 604 else 605 # Some files, jli.dll, appears twice in the image but only one of 606 # thme has a diz file next to it. 607 OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)" 608 if [ ! -f "$OTHER_DIZ_FILE" ]; then 609 # As a last resort, look for diz file in the whole build output 610 # dir. 611 OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)" 612 fi 613 fi 614 if [ -n "$OTHER_DIZ_FILE" ]; then 615 $MKDIR -p $FILE_WORK_DIR/other 616 (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE) 617 export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other" 618 fi 619 THIS_FILE_BASE=${THIS_FILE/.dll/} 620 THIS_FILE_BASE=${THIS_FILE_BASE/.exe/} 621 if [ -f "${THIS_FILE/.dll/}.diz" ]; then 622 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz 623 else 624 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" 625 if [ ! -f "$THIS_DIZ_FILE" ]; then 626 # As a last resort, look for diz file in the whole build output 627 # dir. 628 THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)" 629 fi 630 fi 631 if [ -n "$THIS_DIZ_FILE" ]; then 632 $MKDIR -p $FILE_WORK_DIR/this 633 (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE) 634 export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this" 635 fi 636 fi 637 638 if [ -z "$SKIP_BIN_DIFF" ]; then 639 if cmp $OTHER_FILE $THIS_FILE > /dev/null; then 640 # The files were bytewise identical. 641 if [ -n "$VERBOSE" ]; then 642 echo " : : : : : : $BIN_FILE" 643 fi 644 return 0 645 fi 646 BIN_MSG=" diff " 647 if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then 648 DIFF_BIN=true 649 if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then 650 BIN_MSG="*$BIN_MSG*" 651 REGRESSIONS=true 652 else 653 BIN_MSG=" $BIN_MSG " 654 fi 655 else 656 BIN_MSG="($BIN_MSG)" 657 DIFF_BIN= 658 fi 659 fi 660 661 if [ -n "$STAT" ]; then 662 THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE") 663 OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE") 664 else 665 THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }') 666 OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }') 667 fi 668 if [ $THIS_SIZE -ne $OTHER_SIZE ]; then 669 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE) 670 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE) 671 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM) 672 if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \ 673 && [ "$DIFF_SIZE_REL" -lt 102 ]; then 674 SIZE_MSG="($SIZE_MSG)" 675 DIFF_SIZE= 676 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \ 677 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \ 678 && [ "$DIFF_SIZE_NUM" = 512 ]; then 679 # On windows, size of binaries increase in 512 increments. 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 else 689 if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 690 DIFF_SIZE=true 691 if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 692 SIZE_MSG="*$SIZE_MSG*" 693 REGRESSIONS=true 694 else 695 SIZE_MSG=" $SIZE_MSG " 696 fi 697 else 698 SIZE_MSG="($SIZE_MSG)" 699 DIFF_SIZE= 700 fi 701 fi 702 else 703 SIZE_MSG=" " 704 DIFF_SIZE= 705 if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then 706 SIZE_MSG=" ! " 707 fi 708 fi 709 710 if [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then 711 SYM_SORT_CMD="sort" 712 else 713 SYM_SORT_CMD="cat" 714 fi 715 716 # Check symbols 717 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 718 # The output from dumpbin on windows differs depending on if the debug symbol 719 # files are still around at the location the binary is pointing too. Need 720 # to filter out that extra information. 721 $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 722 $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 723 elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then 724 # Some symbols get seemingly random 15 character prefixes. Filter them out. 725 $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 726 $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 727 else 728 $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 729 $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 730 fi 731 732 LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff 733 if [ -s $WORK_FILE_BASE.symbols.diff ]; then 734 SYM_MSG=" diff " 735 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then 736 DIFF_SYM=true 737 if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then 738 SYM_MSG="*$SYM_MSG*" 739 REGRESSIONS=true 740 else 741 SYM_MSG=" $SYM_MSG " 742 fi 743 else 744 SYM_MSG="($SYM_MSG)" 745 DIFF_SYM= 746 fi 747 else 748 SYM_MSG=" " 749 DIFF_SYM= 750 if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then 751 SYM_MSG=" ! " 752 fi 753 fi 754 755 # Check dependencies 756 if [ -n "$LDD_CMD" ]; then 757 (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) 758 (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) 759 (cd $FILE_WORK_DIR && $RM -f $NAME) 760 761 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff 762 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq 763 764 if [ -s $WORK_FILE_BASE.deps.diff ]; then 765 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then 766 DEP_MSG=" diff " 767 else 768 DEP_MSG=" redun " 769 fi 770 if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then 771 DIFF_DEP=true 772 if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then 773 DEP_MSG="*$DEP_MSG*" 774 REGRESSIONS=true 775 else 776 DEP_MSG=" $DEP_MSG " 777 fi 778 else 779 DEP_MSG="($DEP_MSG)" 780 DIFF_DEP= 781 fi 782 else 783 DEP_MSG=" " 784 DIFF_DEP= 785 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 786 DEP_MSG=" ! " 787 fi 788 fi 789 else 790 DEP_MSG=" - " 791 fi 792 793 # Compare fulldump output 794 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then 795 $FULLDUMP_CMD $OTHER_FILE > $WORK_FILE_BASE.fulldump.other 2>&1 796 $FULLDUMP_CMD $THIS_FILE > $WORK_FILE_BASE.fulldump.this 2>&1 797 LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this > $WORK_FILE_BASE.fulldump.diff 798 799 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then 800 ELF_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}') 801 ELF_MSG=$($PRINTF "%8d" $ELF_DIFF_SIZE) 802 if [[ "$ACCEPTED_ELF_DIFF" != *"$BIN_FILE"* ]]; then 803 DIFF_ELF=true 804 if [[ "$KNOWN_ELF_DIFF" != *"$BIN_FILE"* ]]; then 805 ELF_MSG="*$ELF_MSG*" 806 REGRESSIONS=true 807 else 808 ELF_MSG=" $ELF_MSG " 809 fi 810 else 811 ELF_MSG="($ELF_MSG)" 812 DIFF_ELF= 813 fi 814 else 815 ELF_MSG=" " 816 DIFF_ELF= 817 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 818 ELF_MSG=" ! " 819 fi 820 fi 821 fi 822 823 # Compare disassemble output 824 if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then 825 # By default we filter out differences that include references to symbols. 826 # To get a raw diff with the complete disassembly, set 827 # DIS_DIFF_FILTER="$CAT" 828 if [ -z "$DIS_DIFF_FILTER" ]; then 829 DIS_DIFF_FILTER="$GREP -v ' # .* <.*>$'" 830 fi 831 $DIS_CMD $OTHER_FILE | $GREP -v $NAME | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.other 2>&1 832 $DIS_CMD $THIS_FILE | $GREP -v $NAME | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.this 2>&1 833 834 LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff 835 836 if [ -s $WORK_FILE_BASE.dis.diff ]; then 837 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}') 838 DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE) 839 if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then 840 DIFF_DIS=true 841 if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then 842 DIS_MSG="*$DIS_MSG*" 843 REGRESSIONS=true 844 else 845 DIS_MSG=" $DIS_MSG " 846 fi 847 else 848 DIS_MSG="($DIS_MSG)" 849 DIFF_DIS= 850 fi 851 else 852 DIS_MSG=" " 853 DIFF_DIS= 854 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then 855 DIS_MSG=" ! " 856 fi 857 fi 858 fi 859 860 861 if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_ELF$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then 862 if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi 863 if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi 864 if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi 865 if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi 866 if [ -n "$ELF_MSG" ]; then echo -n "$ELF_MSG:"; fi 867 if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi 868 echo " $BIN_FILE" 869 if [ "$SHOW_DIFFS" = "true" ]; then 870 if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then 871 echo "Symbols diff:" 872 $CAT $WORK_FILE_BASE.symbols.diff 873 fi 874 if [ -s "$WORK_FILE_BASE.deps.diff" ]; then 875 echo "Deps diff:" 876 $CAT $WORK_FILE_BASE.deps.diff 877 fi 878 if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then 879 echo "Fulldump diff:" 880 $CAT $WORK_FILE_BASE.fulldump.diff 881 fi 882 if [ -s "$WORK_FILE_BASE.dis.diff" ]; then 883 echo "Disassembly diff:" 884 $CAT $WORK_FILE_BASE.dis.diff 885 fi 886 fi 887 return 1 888 fi 889 return 0 890} 891 892########################################################################################## 893# Print binary diff header 894 895print_binary_diff_header() { 896 if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi 897 if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi 898 if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi 899 if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi 900 if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi 901 if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi 902 echo 903} 904 905########################################################################################## 906# Compare all libraries 907 908compare_all_libs() { 909 THIS_DIR=$1 910 OTHER_DIR=$2 911 WORK_DIR=$3 912 913 LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' \ 914 -o -name '*.dll' -o -name '*.obj' -o -name '*.o' \ 915 -o -name '*.cpl' \) | $SORT | $FILTER) 916 917 if [ -n "$LIBS" ]; then 918 echo Libraries... 919 print_binary_diff_header 920 for l in $LIBS; do 921 if [ -f "$OTHER_DIR/$l" ]; then 922 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l 923 if [ "$?" != "0" ]; then 924 return_value=1 925 fi 926 fi 927 done 928 fi 929 930 return $return_value 931} 932 933########################################################################################## 934# Compare all executables 935 936compare_all_execs() { 937 THIS_DIR=$1 938 OTHER_DIR=$2 939 WORK_DIR=$3 940 941 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 942 EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER) 943 else 944 EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \ 945 \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \ 946 -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \ 947 -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \ 948 -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \ 949 -o -name 'classlist' \) | $SORT | $FILTER) 950 fi 951 952 if [ -n "$EXECS" ]; then 953 echo Executables... 954 print_binary_diff_header 955 for e in $EXECS; do 956 if [ -f "$OTHER_DIR/$e" ]; then 957 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e 958 if [ "$?" != "0" ]; then 959 return_value=1 960 fi 961 fi 962 done 963 fi 964 965 return $return_value 966} 967 968########################################################################################## 969# Initiate configuration 970 971COMPARE_ROOT=/tmp/cimages.$USER 972$MKDIR -p $COMPARE_ROOT 973if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 974 if [ "$(uname -o)" = "Cygwin" ]; then 975 COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT) 976 fi 977fi 978 979THIS="$( cd "$( dirname "$0" )" && pwd )" 980echo "$THIS" 981THIS_SCRIPT="$0" 982 983if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then 984 echo "bash ./compare.sh [OPTIONS] [FILTER]" 985 echo "" 986 echo "-all Compare all files in all known ways" 987 echo "-names Compare the file names and directory structure" 988 echo "-perms Compare the permission bits on all files and directories" 989 echo "-types Compare the output of the file command on all files" 990 echo "-general Compare the files not convered by the specialized comparisons" 991 echo "-zips Compare the contents of all zip files" 992 echo "-jars Compare the contents of all jar files" 993 echo "-libs Compare all native libraries" 994 echo "-execs Compare all executables" 995 echo "-v Verbose output, does not hide known differences" 996 echo "-vv More verbose output, shows diff output of all comparisons" 997 echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory" 998 echo "" 999 echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs" 1000 echo "Example:" 1001 echo "bash ./common/bin/compareimages.sh CodePointIM.jar" 1002 echo "" 1003 echo "-2zips <file1> <file2> Compare two zip files only" 1004 echo "-2bins <file1> <file2> Compare two binary files only" 1005 echo "-2dirs <dir1> <dir2> Compare two directories as if they were images" 1006 echo "" 1007 exit 10 1008fi 1009 1010CMP_NAMES=false 1011CMP_PERMS=false 1012CMP_TYPES=false 1013CMP_GENERAL=false 1014CMP_ZIPS=false 1015CMP_JARS=false 1016CMP_LIBS=false 1017CMP_EXECS=false 1018 1019while [ -n "$1" ]; do 1020 case "$1" in 1021 -v) 1022 VERBOSE=true 1023 ;; 1024 -vv) 1025 VERBOSE=true 1026 SHOW_DIFFS=true 1027 ;; 1028 -o) 1029 OTHER="$2" 1030 shift 1031 ;; 1032 -all) 1033 CMP_NAMES=true 1034 if [ "$OPENJDK_TARGET_OS" != "windows" ]; then 1035 CMP_PERMS=true 1036 fi 1037 CMP_TYPES=true 1038 CMP_GENERAL=true 1039 CMP_ZIPS=true 1040 CMP_JARS=true 1041 CMP_LIBS=true 1042 CMP_EXECS=true 1043 ;; 1044 -names) 1045 CMP_NAMES=true 1046 ;; 1047 -perms) 1048 CMP_PERMS=true 1049 ;; 1050 -types) 1051 CMP_TYPES=true 1052 ;; 1053 -general) 1054 CMP_GENERAL=true 1055 ;; 1056 -zips) 1057 CMP_ZIPS=true 1058 ;; 1059 -jars) 1060 CMP_JARS=true 1061 ;; 1062 -libs) 1063 CMP_LIBS=true 1064 ;; 1065 -execs) 1066 CMP_EXECS=true 1067 ;; 1068 -2dirs) 1069 THIS="$(cd "$2" && pwd )" 1070 OTHER="$(cd "$3" && pwd )" 1071 THIS_BASE_DIR="$THIS" 1072 OTHER_BASE_DIR="$OTHER" 1073 SKIP_DEFAULT=true 1074 shift 1075 shift 1076 ;; 1077 -2zips) 1078 CMP_2_ZIPS=true 1079 THIS_FILE=$2 1080 OTHER_FILE=$3 1081 shift 1082 shift 1083 ;; 1084 -2bins) 1085 CMP_2_BINS=true 1086 THIS_FILE=$2 1087 OTHER_FILE=$3 1088 shift 1089 shift 1090 ;; 1091 *) 1092 CMP_NAMES=false 1093 CMP_PERMS=false 1094 CMP_TYPES=false 1095 CMP_ZIPS=true 1096 CMP_JARS=true 1097 CMP_LIBS=true 1098 CMP_EXECS=true 1099 1100 if [ -z "$FILTER" ]; then 1101 FILTER="$GREP" 1102 fi 1103 FILTER="$FILTER -e $1" 1104 ;; 1105 esac 1106 shift 1107done 1108 1109if [ "$CMP_2_ZIPS" = "true" ]; then 1110 THIS_DIR="$(dirname $THIS_FILE)" 1111 THIS_DIR="$(cd "$THIS_DIR" && pwd )" 1112 OTHER_DIR="$(dirname $OTHER_FILE)" 1113 OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 1114 THIS_FILE_NAME="$(basename $THIS_FILE)" 1115 OTHER_FILE_NAME="$(basename $OTHER_FILE)" 1116 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 1117 compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME 1118 exit 1119fi 1120 1121if [ "$CMP_2_BINS" = "true" ]; then 1122 THIS_DIR="$(dirname $THIS_FILE)" 1123 THIS_DIR="$(cd "$THIS_DIR" && pwd )" 1124 OTHER_DIR="$(dirname $OTHER_FILE)" 1125 OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 1126 THIS_FILE_NAME="$(basename $THIS_FILE)" 1127 OTHER_FILE_NAME="$(basename $OTHER_FILE)" 1128 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 1129 compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME 1130 exit 1131fi 1132 1133if [ "$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 1134 CMP_NAMES=true 1135 CMP_PERMS=true 1136 CMP_TYPES=true 1137 CMP_GENERAL=true 1138 CMP_ZIPS=true 1139 CMP_JARS=true 1140 CMP_LIBS=true 1141 CMP_EXECS=true 1142fi 1143 1144if [ -z "$FILTER" ]; then 1145 FILTER="$CAT" 1146fi 1147 1148if [ "$SKIP_DEFAULT" != "true" ]; then 1149 if [ -z "$OTHER" ]; then 1150 echo "Nothing to compare to, set with -o" 1151 exit 1 1152 else 1153 if [ ! -d "$OTHER" ]; then 1154 echo "Other build directory does not exist:" 1155 echo "$OTHER" 1156 exit 1 1157 fi 1158 OTHER="$( cd "$OTHER" && pwd )" 1159 echo "Comparing to:" 1160 echo "$OTHER" 1161 echo 1162 fi 1163 1164 1165 # Find the common images to compare, prioritizing later build stages 1166 if [ -d "$THIS/install/j2sdk-image" ] && [ -d "$OTHER/install/j2sdk-image" ]; then 1167 THIS_J2SDK="$THIS/install/j2sdk-image" 1168 THIS_J2RE="$THIS/install/j2re-image" 1169 OTHER_J2SDK="$OTHER/install/j2sdk-image" 1170 OTHER_J2RE="$OTHER/install/j2re-image" 1171 echo "Selecting install images for compare" 1172 elif [ -d "$THIS/deploy/j2sdk-image" ] && [ -d "$OTHER/deploy/j2sdk-image" ]; then 1173 THIS_J2SDK="$THIS/deploy/j2sdk-image" 1174 THIS_J2RE="$THIS/deploy/j2re-image" 1175 OTHER_J2SDK="$OTHER/deploy/j2sdk-image" 1176 OTHER_J2RE="$OTHER/deploy/j2re-image" 1177 echo "Selecting deploy images for compare" 1178 elif [ -d "$THIS/images/j2sdk-image" ] && [ -d "$OTHER/images/j2sdk-image" ]; then 1179 THIS_J2SDK="$THIS/images/j2sdk-image" 1180 THIS_J2RE="$THIS/images/j2re-image" 1181 OTHER_J2SDK="$OTHER/images/j2sdk-image" 1182 OTHER_J2RE="$OTHER/images/j2re-image" 1183 echo "Selecting jdk images for compare" 1184 else 1185 echo "No common images found." 1186 exit 1 1187 fi 1188 1189 if [ -d "$THIS/images/j2sdk-bundle" ] && [ -d "$OTHER/images/j2sdk-bundle" ]; then 1190 THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle" 1191 THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle" 1192 OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle" 1193 OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle" 1194 echo "Also comparing macosx bundles" 1195 fi 1196 1197 if [ -d "$THIS/deploy" ] && [ -d "$OTHER/deploy" ]; then 1198 THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/dist/installer/bundles" 1199 OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles" 1200 echo "Also comparing deploy/bundles" 1201 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1202 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/JavaAppletPlugin.plugin" 1203 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/JavaAppletPlugin.plugin" 1204 echo "Also comparing JavaAppletPlugin" 1205 fi 1206 fi 1207 1208 if [ -d "$OTHER/images" ]; then 1209 OTHER_SEC_DIR="$OTHER/images" 1210 else 1211 OTHER_SEC_DIR="$OTHER/tmp" 1212 fi 1213 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" 1214 THIS_SEC_DIR="$THIS/images" 1215 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" 1216 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 1217 if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then 1218 JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" 1219 else 1220 JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" 1221 fi 1222 OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" 1223 OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" 1224 THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" 1225 THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" 1226 fi 1227 1228 if [ -d "$THIS/docs" ] && [ -d "$OTHER/docs" ]; then 1229 THIS_DOCS="$THIS/docs" 1230 OTHER_DOCS="$OTHER/docs" 1231 echo "Also comparing docs" 1232 else 1233 echo "WARNING! Docs haven't been built and won't be compared." 1234 fi 1235fi 1236 1237########################################################################################## 1238# Do the work 1239 1240if [ "$CMP_NAMES" = "true" ]; then 1241 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1242 echo -n "J2SDK " 1243 compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1244 echo -n "J2RE " 1245 compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1246 1247 echo -n "J2SDK " 1248 compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1249 echo -n "J2RE " 1250 compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1251 fi 1252 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1253 echo -n "J2SDK Bundle " 1254 compare_dirs $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle 1255 echo -n "J2RE Bundle " 1256 compare_dirs $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle 1257 1258 echo -n "J2SDK Bundle " 1259 compare_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle 1260 echo -n "J2RE Bundle " 1261 compare_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle 1262 fi 1263 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then 1264 echo -n "Docs " 1265 compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1266 echo -n "Docs " 1267 compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1268 fi 1269 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1270 compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1271 compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1272 fi 1273 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1274 echo -n "JavaAppletPlugin " 1275 compare_dirs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1276 echo -n "JavaAppletPlugin " 1277 compare_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1278 fi 1279fi 1280 1281if [ "$CMP_PERMS" = "true" ]; then 1282 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1283 echo -n "J2SDK " 1284 compare_permissions $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1285 echo -n "J2RE " 1286 compare_permissions $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1287 fi 1288 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1289 compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1290 fi 1291 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1292 echo -n "JavaAppletPlugin " 1293 compare_permissions $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1294 fi 1295fi 1296 1297if [ "$CMP_TYPES" = "true" ]; then 1298 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1299 echo -n "J2SDK " 1300 compare_file_types $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1301 echo -n "J2RE " 1302 compare_file_types $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1303 fi 1304 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1305 echo -n "J2SDK Bundle " 1306 compare_file_types $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle 1307 echo -n "J2RE Bundle " 1308 compare_file_types $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle 1309 fi 1310 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1311 compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1312 fi 1313 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1314 echo -n "JavaAppletPlugin " 1315 compare_file_types $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1316 fi 1317fi 1318 1319if [ "$CMP_GENERAL" = "true" ]; then 1320 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1321 echo -n "J2SDK " 1322 compare_general_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1323 echo -n "J2RE " 1324 compare_general_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1325 fi 1326 if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then 1327 echo -n "J2SDK Bundle " 1328 compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle 1329 echo -n "J2RE Bundle " 1330 compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle 1331 fi 1332 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then 1333 echo -n "Docs " 1334 compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs 1335 fi 1336 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1337 compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1338 fi 1339 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1340 echo -n "JavaAppletPlugin " 1341 compare_general_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1342 fi 1343fi 1344 1345if [ "$CMP_ZIPS" = "true" ]; then 1346 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1347 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1348 fi 1349 if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then 1350 if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then 1351 echo "sec-bin.zip..." 1352 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip 1353 fi 1354 fi 1355 if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then 1356 if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then 1357 echo "sec-windows-bin.zip..." 1358 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip 1359 fi 1360 fi 1361 if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then 1362 if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then 1363 echo "$JGSS_WINDOWS_BIN..." 1364 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN 1365 fi 1366 fi 1367 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1368 compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1369 fi 1370 if [ -n "$THIS_DEPLOY_BUNDLE_DIR" ] && [ -n "$OTHER_DEPLOY_BUNDLE_DIR" ]; then 1371 compare_all_zip_files $THIS_DEPLOY_BUNDLE_DIR $OTHER_DEPLOY_BUNDLE_DIR $COMPARE_ROOT/deploy-bundle 1372 fi 1373 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1374 compare_all_zip_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1375 fi 1376fi 1377 1378if [ "$CMP_JARS" = "true" ]; then 1379 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1380 compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1381 fi 1382 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1383 compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1384 fi 1385 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1386 compare_all_jar_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1387 fi 1388fi 1389 1390if [ "$CMP_LIBS" = "true" ]; then 1391 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1392 echo -n "J2SDK " 1393 compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1394 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1395 echo -n "J2RE " 1396 compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1397 fi 1398 fi 1399 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1400 compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1401 fi 1402 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1403 echo -n "JavaAppletPlugin " 1404 compare_all_libs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1405 fi 1406fi 1407 1408if [ "$CMP_EXECS" = "true" ]; then 1409 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1410 compare_all_execs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1411 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then 1412 echo -n "J2RE " 1413 compare_all_execs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re 1414 fi 1415 fi 1416 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then 1417 compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir 1418 fi 1419 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then 1420 echo -n "JavaAppletPlugin " 1421 compare_all_execs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin 1422 fi 1423fi 1424 1425echo 1426 1427if [ -n "$REGRESSIONS" ]; then 1428 echo "REGRESSIONS FOUND!" 1429 echo 1430 exit 1 1431else 1432 echo "No regressions found" 1433 echo 1434 exit 0 1435fi 1436