jdk-sandbox: comparison make/scripts/compare.sh

equal deleted inserted replaced

-:8830bb9587c2
+:ab7fcc43dab4
 -e 's/last modified: .*//' \
 "
 echo -n File types...
 found=""
-for f in `cd $OTHER_DIR && $FIND . ! -type d`
+# The file command does not know about jmod files and this sometimes results
+# in different types being detected more or less randomly.
+for f in $(cd $OTHER_DIR && $FIND . ! -type d -a ! -name "*.jmod")
 do
 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
 OF=$(cd ${OTHER_DIR} && $FILE -h $f | eval $FILE_TYPES_FILTER)
 TF=$(cd ${THIS_DIR} && $FILE -h $f | eval $FILE_TYPES_FILTER)
 THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
 OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
 $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
 $MKDIR -p $THIS_UNZIPDIR
 $MKDIR -p $OTHER_UNZIPDIR
-if [ "$TYPE" = "jar" -o "$TYPE" = "war" -o "$TYPE" = "zip" -o "$TYPE" = "jmod" ]
+if [ "$TYPE" = "jar" -o "$TYPE" = "war" -o "$TYPE" = "zip" ]
 then
 (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
 elif [ "$TYPE" = "gz" ]
 then
 (cd $THIS_UNZIPDIR && $GUNZIP -c $THIS_ZIP | $TAR xf -)
 (cd $OTHER_UNZIPDIR && $GUNZIP -c $OTHER_ZIP | $TAR xf -)
+elif [ "$TYPE" = "jmod" ]
+then
+(cd $THIS_UNZIPDIR && $JMOD extract $THIS_ZIP)
+(cd $OTHER_UNZIPDIR && $JMOD extract $OTHER_ZIP)
 else
 (cd $THIS_UNZIPDIR && $JIMAGE extract $THIS_ZIP)
 (cd $OTHER_UNZIPDIR && $JIMAGE extract $OTHER_ZIP)
 fi
 echo "        Only THIS $ZIP_FILE contains:"
 echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR|            |"g | sed 's|: |/|g'
 return_value=1
 fi
-if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
-DIFFING_FILES=$($GREP -e 'differ$' -e '^diff ' $CONTENTS_DIFF_FILE \
-| $SED -e 's/^Files //g' -e 's/diff -r //g' | $CUT -f 1 -d ' ' \
-| $SED "s|$OTHER_UNZIPDIR/||g")
-else
-DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
-| $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
-fi
 if [ "$CMP_ZIPS_CONTENTS" = "true" ]; then
+if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
+DIFFING_FILES=$($GREP -e 'differ$' -e '^diff ' $CONTENTS_DIFF_FILE \
+| $SED -e 's/^Files //g' -e 's/diff -r //g' | $CUT -f 1 -d ' ' \
+| $SED "s|$OTHER_UNZIPDIR/||g")
+else
+DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
+| $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
+fi
 $RM -f $WORK_DIR/$ZIP_FILE.diffs
 for file in $DIFFING_FILES; do
 if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then
 diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
 fi
 fi
 return $return_value
 }
+################################################################################
+# Compare jmod file
+compare_jmod_file() {
+THIS_DIR=$1
+OTHER_DIR=$2
+WORK_DIR=$3
+JMOD_FILE=$4
+THIS_JMOD=$THIS_DIR/$JMOD_FILE
+OTHER_JMOD=$OTHER_DIR/$JMOD_FILE
+if $CMP $OTHER_JMOD $THIS_JMOD > /dev/null; then
+return 0
+fi
+THIS_JMOD_LIST=$WORK_DIR/$JMOD_FILE.list.this
+OTHER_JMOD_LIST=$WORK_DIR/$JMOD_FILE.list.other
+mkdir -p $(dirname $THIS_JMOD_LIST) $(dirname $OTHER_JMOD_LIST)
+$JMOD list $THIS_JMOD | sort > $THIS_JMOD_LIST
+$JMOD list $OTHER_JMOD | sort > $OTHER_JMOD_LIST
+JMOD_LIST_DIFF_FILE=$WORK_DIR/$JMOD_FILE.list.diff
+LC_ALL=C $DIFF $THIS_JMOD_LIST $OTHER_JMOD_LIST > $JMOD_LIST_DIFF_FILE
+ONLY_THIS=$($GREP "^<" $JMOD_LIST_DIFF_FILE)
+ONLY_OTHER=$($GREP "^>" $JMOD_LIST_DIFF_FILE)
+if [ -n "$ONLY_OTHER" ]; then
+echo "        Only OTHER $JMOD_FILE contains:"
+echo "$ONLY_OTHER" | sed "s|^>|            |"g | sed 's|: |/|g'
+return_value=1
+fi
+if [ -n "$ONLY_THIS" ]; then
+echo "        Only THIS $JMOD_FILE contains:"
+echo "$ONLY_THIS" | sed "s|^<|            |"g | sed 's|: |/|g'
+return_value=1
+fi
+return $return_value
+}
 ################################################################################
 # Compare all zip files
 compare_all_zip_files() {
 return_value=0
 for f in $ZIPS; do
 if [ -f "$OTHER_DIR/$f" ]; then
 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
+if [ "$?" != "0" ]; then
+return_value=1
+REGRESSIONS=true
+fi
+fi
+done
+fi
+return $return_value
+}
+################################################################################
+# Compare all jmod files
+compare_all_jmod_files() {
+THIS_DIR=$1
+OTHER_DIR=$2
+WORK_DIR=$3
+JMODS=$(cd $THIS_DIR && $FIND . -type f -name "*.jmod" | $SORT | $FILTER )
+if [ -n "$JMODS" ]; then
+echo Jmod files...
+return_value=0
+for f in $JMODS; do
+if [ -f "$OTHER_DIR/$f" ]; then
+compare_jmod_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
 if [ "$?" != "0" ]; then
 return_value=1
 REGRESSIONS=true
 fi
 fi
 echo "-types              Compare the output of the file command on all files"
 echo "-general            Compare the files not convered by the specialized comparisons"
 echo "-zips               Compare the contents of all zip files and files in them"
 echo "-zips-names         Compare the file names inside all zip files"
 echo "-jars               Compare the contents of all jar files"
+echo "-jmods              Compare the listings of all jmod files"
 echo "-libs               Compare all native libraries"
 echo "-execs              Compare all executables"
 echo "-v                  Verbose output, does not hide known differences"
 echo "-vv                 More verbose output, shows diff output of all comparisons"
 echo "-o [OTHER]          Compare with build in other directory. Will default to the old build directory"
 CMP_TYPES=false
 CMP_GENERAL=false
 CMP_ZIPS=false
 CMP_ZIPS_CONTENTS=true
 CMP_JARS=false
+CMP_JMODS=false
 CMP_LIBS=false
 CMP_EXECS=false
 while [ -n "$1" ]; do
 case "$1" in
 fi
 CMP_TYPES=true
 CMP_GENERAL=true
 CMP_ZIPS=true
 CMP_JARS=true
+CMP_JMODS=true
 CMP_LIBS=true
 CMP_EXECS=true
 ;;
 -names)
 CMP_NAMES=true
 CMP_ZIPS=true
 CMP_ZIPS_CONTENTS=false
 ;;
 -jars)
 CMP_JARS=true
+;;
+-jmods)
+CMP_JMODS=true
 ;;
 -libs)
 CMP_LIBS=true
 ;;
 -execs)
 CMP_NAMES=false
 CMP_PERMS=false
 CMP_TYPES=false
 CMP_ZIPS=true
 CMP_JARS=true
+CMP_JMODS=true
 CMP_LIBS=true
 CMP_EXECS=true
 if [ -z "$FILTER" ]; then
 FILTER="$GREP"
 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
 compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME
 exit
 fi
-if [ "$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
+if [ "$CMP_NAMES" = "false" ] \
+&& [ "$CMP_TYPES" = "false" ] \
+&& [ "$CMP_PERMS" = "false" ] \
+&& [ "$CMP_GENERAL" = "false" ] \
+&& [ "$CMP_ZIPS" = "false" ] \
+&& [ "$CMP_JARS" = "false" ] \
+&& [ "$CMP_JMODS" = "false" ] \
+&& [ "$CMP_LIBS" = "false" ] \
+&& [ "$CMP_EXECS" = "false" ]; then
 CMP_NAMES=true
 CMP_PERMS=true
 CMP_TYPES=true
 CMP_GENERAL=true
 CMP_ZIPS=true
 CMP_JARS=true
+CMP_JMODS=true
 CMP_LIBS=true
 CMP_EXECS=true
 fi
 if [ -z "$FILTER" ]; then
 OTHER="$(ls -d $OTHER/licensee-src/build/*)"
 THIS_JDK="$THIS/images/jdk"
 OTHER_JDK="$OTHER/images/jdk"
 # Rewrite the path to tools that are used from the build
 JIMAGE="$(echo "$JIMAGE" | $SED "s|$OLD_THIS|$THIS|g")"
+JMOD="$(echo "$JMOD" | $SED "s|$OLD_THIS|$THIS|g")"
 JAVAP="$(echo "$JAVAP" | $SED "s|$OLD_THIS|$THIS|g")"
 else
 echo "No common images found."
 exit 1
 fi
 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
 compare_all_jar_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
 fi
 fi
+if [ "$CMP_JMODS" = "true" ]; then
+if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
+compare_all_jmod_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
+fi
+if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
+compare_all_jmod_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
+fi
+fi
 if [ "$CMP_PERMS" = "true" ]; then
 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
 echo -n "JDK "
 compare_permissions $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
 fi

changeset 53570	ab7fcc43dab4
parent 52030	57862a02bf4b
child 54325	04f1a0f925db