Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8170576: Silence error message in compare.sh when selecting images
authorihse
Thu, 01 Dec 2016 10:43:59 +0100
changeset 42288 600cfdaa270a
parent 42287 925cf8cf736c
child 42291 b2b1baadc3db
8170576: Silence error message in compare.sh when selecting images Reviewed-by: erikj
common/bin/compare.sh file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox