comparison make/autoconf/compare.sh.in @ 49578:7c82bb507446

8190333: sun/security/ssl/X509KeyManager/PreferredKey.java failed with "Failed to get the preferable key aliases" Reviewed-by: mullan
author amjiang
date Tue, 10 Apr 2018 18:16:12 -0700
parents fdac20095dff
children 50677f43ac3d
comparison
equal deleted inserted replaced
2:a8cab98fc625 3:ac412ff0de2d
68 export UNIQ="@UNIQ@" 68 export UNIQ="@UNIQ@"
69 export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200" 69 export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
70 export UNARCHIVE="@UNZIP@ -q -o" 70 export UNARCHIVE="@UNZIP@ -q -o"
71 71
72 export TOPDIR="@TOPDIR@" 72 export TOPDIR="@TOPDIR@"
73 export OUTPUT_ROOT="@OUTPUT_ROOT@" 73 export OUTPUTDIR="@OUTPUTDIR@"
74 74
75 if [ "@COMPILE_TYPE@" != "cross" ]; then 75 if [ "@COMPILE_TYPE@" != "cross" ]; then
76 export JAVAP="@FIXPATH@ $OUTPUT_ROOT/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@" 76 export JAVAP="@FIXPATH@ $OUTPUTDIR/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
77 export JIMAGE="@FIXPATH@ $OUTPUT_ROOT/jdk/bin/jimage" 77 export JIMAGE="@FIXPATH@ $OUTPUTDIR/jdk/bin/jimage"
78 elif [ "@CREATE_BUILDJDK@" = "true" ]; then 78 elif [ "@CREATE_BUILDJDK@" = "true" ]; then
79 export JAVAP="@FIXPATH@ $OUTPUT_ROOT/buildjdk/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@" 79 export JAVAP="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
80 export JIMAGE="@FIXPATH@ $OUTPUT_ROOT/buildjdk/jdk/bin/jimage" 80 export JIMAGE="@FIXPATH@ $OUTPUTDIR/buildjdk/jdk/bin/jimage"
81 else 81 else
82 export JAVAP="@FIXPATH@ @BUILD_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@" 82 export JAVAP="@FIXPATH@ @BUILD_JDK@/bin/javap @JAVA_TOOL_FLAGS_SMALL@"
83 export JIMAGE="@FIXPATH@ @BUILD_JDK@/bin/jimage" 83 export JIMAGE="@FIXPATH@ @BUILD_JDK@/bin/jimage"
84 fi 84 fi
85 85
93 echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT" 93 echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
94 exit 1 94 exit 1
95 fi 95 fi
96 96
97 # Rotate logs 97 # Rotate logs
98 $RM $OUTPUT_ROOT/compare.log.old 2> /dev/null 98 $RM $OUTPUTDIR/compare.log.old 2> /dev/null
99 $MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null 99 $MV $OUTPUTDIR/compare.log $OUTPUTDIR/compare.log.old 2> /dev/null
100 100
101 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )" 101 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
102 102
103 $BASH $TOPDIR/make/scripts/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@" 103 $BASH $TOPDIR/make/scripts/logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"