OpenJDK / portola / portola
changeset 42291:b2b1baadc3db
Merge
| author | alanb |
|---|---|
| date | Thu, 01 Dec 2016 11:20:22 +0000 |
| parents | 78f42d447fc3 600cfdaa270a |
| children | 11f0a32a38f0 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/compare.sh Thu Dec 01 11:14:50 2016 +0000 +++ b/common/bin/compare.sh Thu Dec 01 11:20:22 2016 +0000 @@ -1295,8 +1295,8 @@ OTHER_JDK="$OTHER/images/jdk" OTHER_JRE="$OTHER/images/jre" echo "Selecting jdk images for compare" - elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk)" ] \ - && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk)" ] + elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk 2> /dev/null)" ] \ + && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk 2> /dev/null)" ] then echo "Selecting licensee images for compare" # Simply override the THIS and OTHER dir with the build dir from