changeset 56199:378007c18687

8230715: Baseline compare build on Windows fails intermittently in file type for jvm.pdb Reviewed-by: mikael
author erikj
date Fri, 06 Sep 2019 12:41:21 -0700
parents 318cd16cc202
children aa3715655834
files make/scripts/compare.sh
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/scripts/compare.sh	Fri Sep 06 14:54:33 2019 -0400
+++ b/make/scripts/compare.sh	Fri Sep 06 12:41:21 2019 -0700
@@ -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
@@ -362,6 +362,12 @@
                 # 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"