Skip to content

Commit

Permalink
Quieten down repro_common functions
Browse files Browse the repository at this point in the history
  • Loading branch information
steelhead31 committed Feb 27, 2024
1 parent a085a96 commit 769eecc
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions tooling/repro_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ function removeSystemModulesHashBuilderParams() {
virtualFunction="invokevirtual"

systemModules="SystemModules\$0.class SystemModules\$all.class SystemModules\$default.class"
echo "Removing SystemModules ModulesHashes\$Builder differences"
# echo "Removing SystemModules ModulesHashes\$Builder differences"
for systemModule in $systemModules
do
FILES=$(find "${JDK_DIR}" -type f -name "$systemModule")
for f in $FILES
do
echo "Processing $f"
# echo "Processing $f"
javap -v -sysinfo -l -p -c -s -constants "$f" > "$f.javap.tmp"
rm "$f"

Expand All @@ -107,7 +107,7 @@ function removeSystemModulesHashBuilderParams() {
if [[ "$cc" -eq 3 ]] && [[ "$line" =~ .*"$moduleString"[a-z\.]+.* ]]; then
found=true
module=$(echo "$line" | tr -s ' ' | tr -d '\r' | cut -d' ' -f6)
echo "==> Found $module ModuleHashes\$Builder function, skipping hash parameter"
# echo "==> Found $module ModuleHashes\$Builder function, skipping hash parameter"
fi
# hasForModule function section finishes upon finding invokevirtual
if [[ "$found" = true ]] && [[ "$line" =~ .*"$virtualFunction".* ]]; then
Expand Down Expand Up @@ -141,7 +141,7 @@ function processModuleInfo() {
FILES=$(find "${JDK_DIR}" -type f -name "module-info.class")
for f in $FILES
do
echo "javap and re-order ModuleAttributes for $f"
# echo "javap and re-order ModuleAttributes for $f"
javap -v -sysinfo -l -p -c -s -constants "$f" > "$f.javap.tmp"
rm "$f"

Expand Down Expand Up @@ -219,12 +219,11 @@ function removeSignatures() {
do
f=$(cygpath -w $f)
rc=0
## "$signToolPath" remove /s "$f" 2>&1 /dev/null || rc=$?
"$signToolPath" remove /s "$f" 1> /dev/null || rc=$?
"$signToolPath" remove /s "$f" 1> /dev/null 2>&1 || rc=$?

if [ $rc -ne 0 ]; then
echo "Removing signature from $f failed"
fi
# if [ $rc -ne 0 ]; then
# echo "Removing signature from $f failed"
# fi
done
elif [[ "$OS" =~ Darwin* ]]; then
MAC_JDK_ROOT="${JDK_DIR}/../.."
Expand Down

0 comments on commit 769eecc

Please sign in to comment.