commit 54dabfb04a61def6bd4d114e306120590fa82c60
author Alex Light <allight@google.com> Wed Sep 19 16:29:09 2018 -0700
committer Alex Light <allight@google.com> Thu Sep 20 17:01:45 2018 +0000
tree a1af5360e326e19bd16f033ac71528a27b45cd35
parent e9c1634d987ebe39bb1cac6a01e89bacc3f75503

Make run-test support multiple --with-agent flags

Previously we only supported a single --with-agent flag to be used
with run-test, silently ignoring additional uses. This makes run-test
support an arbitrary number of uses.

Test: ./test/run-test --host --dev 001-HelloWorld
Test: ./test/run-test --host \
                      --dev \
                      --with-agent libtifast.so=log,all \
                      001-HelloWorld
Test: ./test/run-test --host \
                      --dev \
                      --with-agent libtistress.so=jvmti-stress,redefine \
                      --with-agent libtifast.so=log,all \
                      001-HelloWorld

Change-Id: I3fe8538db64f79196037619a274842b3ab37a8d9

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index bd58ae3..de55440 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -17,7 +17,7 @@
 COMPILE_FLAGS=""
 DALVIKVM="dalvikvm32"
 DEBUGGER="n"
-WITH_AGENT=""
+WITH_AGENT=()
 DEBUGGER_AGENT=""
 WRAP_DEBUGGER_AGENT="n"
 DEV_MODE="n"
@@ -232,7 +232,7 @@
     elif [ "x$1" = "x--with-agent" ]; then
         shift
         USE_JVMTI="y"
-        WITH_AGENT="$1"
+        WITH_AGENT+=("$1")
         shift
     elif [ "x$1" = "x--debug-wrap-agent" ]; then
         WRAP_DEBUGGER_AGENT="y"
@@ -454,9 +454,9 @@
   DEBUGGER_OPTS="-agentpath:${AGENTPATH}=transport=dt_socket,address=$PORT,server=y,suspend=y"
 fi
 
-if [ "x$WITH_AGENT" != "x" ]; then
-  FLAGS="${FLAGS} -agentpath:${WITH_AGENT}"
-fi
+for agent in "${WITH_AGENT[@]}"; do
+  FLAGS="${FLAGS} -agentpath:${agent}"
+done
 
 if [ "$USE_JVMTI" = "y" ]; then
   if [ "$USE_JVM" = "n" ]; then