commit 7d2ec61d8ed54d520ea9def9224740c592461b9c
author David Brazdil <dbrazdil@google.com> Fri Jan 19 14:19:59 2018 +0000
committer David Brazdil <dbrazdil@google.com> Fri Jan 19 14:41:23 2018 +0000
tree 59679693bf507130113a17ccfa8513f1d1ee7546
parent f01528de9486c854b5e4da9994239b17b261084f

Copy 'res' folder to device for run-tests

Sometimes tests need to push resources to target for a run-test.
The scripts currently do not have an option how to bundle additional
files with the test. To this end, this patch tests for presence of
folder named 'res' and if it exists, copies it into DEX_LOCATION on
the device.

Test 071 was converted to become the first test using this new feature.

Test: art/test.py -b -r -t 071-dexfile-get-static
Change-Id: I7eac4b15ca19fce6c616f5cc732b7ac65b8174b8

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 631b14a..5e40b86 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -806,6 +806,10 @@
       if [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then
         adb push profile $DEX_LOCATION
       fi
+      # Copy resource folder
+      if [ -d res ]; then
+        adb push res $DEX_LOCATION
+      fi
     else
       adb shell rm -r $DEX_LOCATION >/dev/null 2>&1
       adb shell mkdir -p $DEX_LOCATION >/dev/null 2>&1
@@ -814,7 +818,10 @@
       if [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then
         adb push profile $DEX_LOCATION >/dev/null 2>&1
       fi
-
+      # Copy resource folder
+      if [ -d res ]; then
+        adb push res $DEX_LOCATION >/dev/null 2>&1
+      fi
     fi
 
     LD_LIBRARY_PATH=/data/$TEST_DIRECTORY/art/$ISA