commit de286fdcb4d203438b4b49c22c8a4a24d08ad14d
author Mathieu Chartier <mathieuc@google.com> Thu Sep 03 18:10:29 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Sep 03 18:23:09 2015 -0700
tree 7a07331657f142455732d0161518a02e48d87326
parent 8c679146d7a5c0c193ffab65d786fd5d84b3f4fd

Address some leftover comments

Change-Id: Ia8d01c8b1c10d23efdd94aa76289a1ed3373957c

test/Android.libarttest.mk

diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk
index 90bf5b5..c3d1576 100644
--- a/test/Android.libarttest.mk
+++ b/test/Android.libarttest.mk
@@ -54,14 +54,16 @@
       $$(error expected target or host for argument 1, received $(1))
     endif
   endif
-  ifneq ($(2),d)
+  ifneq ($(2),debug)
     ifneq ($(2),)
       $$(error d or empty for argument 2, received $(2))
     endif
+    suffix := d
+  else
+    suffix :=
   endif
 
   art_target_or_host := $(1)
-  suffix := $(2)
 
   include $(CLEAR_VARS)
   LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
@@ -100,11 +102,11 @@
 
 ifeq ($(ART_BUILD_TARGET),true)
   $(eval $(call build-libarttest,target,))
-  $(eval $(call build-libarttest,target,d))
+  $(eval $(call build-libarttest,target,debug))
 endif
 ifeq ($(ART_BUILD_HOST),true)
   $(eval $(call build-libarttest,host,))
-  $(eval $(call build-libarttest,host,d))
+  $(eval $(call build-libarttest,host,debug))
 endif
 
 # Clear locally used variables.

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 6b57f2b..ad3fb41 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -67,7 +67,7 @@
             echo "$0 missing argument to --testlib" 1>&2
             exit 1
         fi
-       	ARGS="${ARGS} $1"
+        ARGS="${ARGS} $1"
         shift
     elif [ "x$1" = "x-Xcompiler-option" ]; then
         shift