OpenJDK / portola / portola
changeset 42288:600cfdaa270a
8170576: Silence error message in compare.sh when selecting images
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Thu, 01 Dec 2016 10:43:59 +0100 |
| parents | 925cf8cf736c |
| children | b2b1baadc3db |
| files | common/bin/compare.sh |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/compare.sh Wed Nov 30 19:28:45 2016 +0530 +++ b/common/bin/compare.sh Thu Dec 01 10:43:59 2016 +0100 @@ -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