infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8326368: compare.sh -2bins prints ugly errors on Windows

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2024-02-20 22:24:25 +00:00
parent 221fbfb436
commit 4d50ee63d6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make/scripts/compare.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -699,14 +699,16 @@ compare_bin_file() {
unset _NT_SYMBOL_PATH unset _NT_SYMBOL_PATH
if [ "$(uname -o)" = "Cygwin" ]; then if [ "$(uname -o)" = "Cygwin" ]; then
THIS=$(cygpath -msa $THIS) THIS=$(cygpath -msa $THIS)
OTHER=$(cygpath -msa $OTHER) if [ -n "$OTHER" ]; then
OTHER=$(cygpath -msa $OTHER)
fi
fi fi
# Build an _NT_SYMBOL_PATH that contains all known locations for # Build an _NT_SYMBOL_PATH that contains all known locations for
# pdb files. # pdb files.
PDB_DIRS="$(ls -d \ PDB_DIRS="$(ls -d \
{$OTHER,$THIS}/support/modules_{cmds,libs}/{*,*/*} \ {$OTHER,$THIS}/support/modules_{cmds,libs}/{*,*/*} \
{$OTHER,$THIS}/support/native/jdk.jpackage/* \ {$OTHER,$THIS}/support/native/jdk.jpackage/* \
)" 2> /dev/null )"
export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')" export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')"
fi fi