Skip to content

Commit

Permalink
8230715: Baseline compare build on Windows fails intermittently in fi…
Browse files Browse the repository at this point in the history
…le type for jvm.pdb

Reviewed-by: mikael
  • Loading branch information
erikj79 committed Sep 6, 2019
1 parent cc6d60d commit 9c3ff10
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion make/scripts/compare.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -362,6 +362,12 @@ compare_file_types() {
# old file but not in new (only files with full-path) this makes file
# report them as different
continue
elif [ "`echo $OF | $GREP -c 'MSVC program database ver 7.00'`" -gt 0 ] \
&& [ "`echo $TF | $GREP -c 'MSVC program database ver 7.00'`" -gt 0 ]
then
# For Windows pdb files the file command reports some kind of size data
# which may sometimes come out randomly different.
continue
else
if [ -z "$found" ]; then echo ; found="yes"; fi
$PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
Expand Down

0 comments on commit 9c3ff10

Please sign in to comment.