host: remove support for make targets & fix 32-bit

We easily can bring test.py support to any older tree by cherry-picking
the test.py patch (art:54515c742e).
Doing this, we don't need to support make target support.

Moreover, we remove the call to set_environment_host, which was causing
the test.py runner to avoid 32-bit tests and only run 64-bit tests.

Test: scripts/test/test_art_host.sh

Change-Id: Ic300399892d3a3d935e2bf1f4ce4c6f308a6f694

1 files changed, 3 insertions, 24 deletions

diff --git a/tests/test_art_host.sh b/tests/test_art_host.sh
index be4c915..e33f995 100755
--- a/tests/test_art_host.sh
+++ b/tests/test_art_host.sh
@@ -58,34 +58,14 @@ argument_parser() {
   done
 }
 
-run_test_with_make_target() {
-  local make_target
-  if [[ $1 == "gtest" ]]; then
-    make_target="test-art-host-gtest"
-  else
-    make_target="test-art-host-run-test-$2"
-  fi
-  local -r test_command="make -j${JCPU_COUNT} $make_target"
-  log I "Running ${test_command}"
-  ${test_command}
-}
-
-run_test_with_python_runner() {
+run_test_unwrapped() {
+  disable_error_on_unset_expansion
   local -r test_command="art/test.py -v -j${JCPU_COUNT} --host --$1 --$2"
   log I "Running ${test_command}"
   ${test_command}
-}
-
-run_test_unwrapped() {
-  disable_error_on_unset_expansion
-
-  if python_runner_exists; then
-    run_test_with_python_runner "$@"
-  else
-    run_test_with_make_target "$@"
-  fi
   local -r return_code=$?
   enable_error_on_unset_expansion
+
   return ${return_code}
 }
 
@@ -118,7 +98,6 @@ main() {
 
   setup_android_target_to_environment_or_default "${default_lunch_target}"
   set_environment_host
-  set_environment_tests
   build_host
 
   test_gtest