Merge "tests: Introduce option to specify ISA features when testing on target"

1 files changed, 21 insertions, 12 deletions

diff --git a/tests/test_art_target.sh b/tests/test_art_target.sh
index d205b0d9..f6ba20cb 100755
--- a/tests/test_art_target.sh
+++ b/tests/test_art_target.sh
@@ -59,6 +59,7 @@ declare -A options_format=(
   ["restart-adb-server"]="false"
   ["gcstress"]="false"
   ["fvp"]="false"
+  ["isa-features"]=""
 )
 declare -A options=()
 
@@ -161,17 +162,22 @@ usage() {
   log I " Not providing a test mode means to run both 32bit and 64bit tests."
   log I "-------------------------------------------"
   log I "Test Options:"
-  log I " --debug              - run tests in debug mode."
-  log I " --concurrent-gc      - run tests using the concurrent gc."
-  log I " --jobs               - a number of jobs on a target."
-  log I "                        The default value is 3."
-  log I " --keep-going         - don't stop at the first failing test."
-  log I " --keep-failures      - keep failing tests around (useful for debugging)."
-  log I " --skip-build         - skip building ART and its dependencies."
-  log I " --rerun-failed-tests - rerun failed tests."
-  log I " --gcstress           - use gc stress testing for run-tests."
-  log I " --fvp                - configure and run tests on Arm FVP (sets"
-  log I "                        --jobs to 1)."
+  log I " --debug                 - run tests in debug mode."
+  log I " --concurrent-gc         - run tests using the concurrent gc."
+  log I " --jobs                  - a number of jobs on a target."
+  log I "                           The default value is 3."
+  log I " --keep-going            - don't stop at the first failing test."
+  log I " --keep-failures         - keep failing tests around (useful for debugging)."
+  log I " --skip-build            - skip building ART and its dependencies."
+  log I " --rerun-failed-tests    - rerun failed tests."
+  log I " --gcstress              - use gc stress testing for run-tests."
+  log I " --fvp                   - configure and run tests on Arm FVP (sets"
+  log I "                           --jobs to 1)."
+  log I " --isa-features          - specify isa features to be used.
+                                    Possible values: default, runtime, a list of comma-separated
+                                    feature names. When the list is used, '-' before a feature name
+                                    means the ART compiler must not use the feature for code
+                                    generation."
   log I "-------------------------------------------"
   log I "Tests:"
   log I " --gtest              - run gtest tests."
@@ -246,8 +252,11 @@ run_test_with_python_runner() {
   else
     test_command+=" --$1 --$2 ${3:+--${3}}"
   fi
+  if [[ -n "${options["isa-features"]}" ]]; then
+    test_command+=" --run-test-option='--instruction-set-features ${options["isa-features"]}'"
+  fi
   log I "Running ${test_command}"
-  ${test_command}
+  eval "${test_command}"
 }
 
 # Build (run) a test target using the Android build system.