commit 8bde036ebd74ce94477e65077bed6dea9c29616b
author Roland Levillain <rpl@google.com> Fri Oct 24 10:45:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 24 10:45:48 2014 +0000
tree 9ededdcc2bb3d595e195e1359cc08ddd1da0fd01
parent 32da24bb26885a9877adcef5b53f283d44b622d2
parent 560b5ac4117602611b2b9d8ba886d120e9cf3fed

Merge "Use test's `-d' option when checking for a directory."

test/etc/default-build

diff --git a/test/etc/default-build b/test/etc/default-build
index 009736b..3369dc6 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -20,7 +20,7 @@
 mkdir classes
 ${JAVAC} -d classes `find src -name '*.java'`
 
-if [ -r src2 ]; then
+if [ -d src2 ]; then
   ${JAVAC} -d classes `find src2 -name '*.java'`
 fi
 
@@ -28,13 +28,13 @@
   ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes
 fi
 
-if [ -r smali ]; then
+if [ -d smali ]; then
   # Compile Smali classes
   ${SMALI} -JXmx256m --output smali_classes.dex `find smali -name '*.smali'`
   ${DXMERGER} classes.dex classes.dex smali_classes.dex
 fi
 
-if [ -r src-ex ]; then
+if [ -d src-ex ]; then
   mkdir classes-ex
   ${JAVAC} -d classes-ex -cp classes `find src-ex -name '*.java'`
   if [ ${NEED_DEX} = "true" ]; then