summaryrefslogtreecommitdiff
path: root/test/testrunner/testrunner.py
diff options
context:
space:
mode:
author Ulyana Trafimovich <skvadrik@google.com> 2020-07-16 15:09:38 +0000
committer Ulyana Trafimovich <skvadrik@google.com> 2020-07-17 11:04:27 +0000
commite886d68b9c40c941d8966b9c90d0e265c75fb19e (patch)
treead78c4e375c95a96e200baa2786e748505ab928b /test/testrunner/testrunner.py
parentf12dd5861e0eaf1822c12137fd353b5e79761a6c (diff)
Revert^2 "VIXL simulator for ART (Stage1)"
This reverts commit 3060bb919cd2f37c6a97e87c1581ac5294af72b3. Reason for revert: relanding original change. The fix is setting `device_supported: false` for libart(d)-simulator module in the .bp file (`m checkbuild` attempted to build it for arm32 and failed). Original commit message: VIXL simulator for ART (Stage1) Quick User Guide: test/README.simulator.md This CL enables running ART run-tests in a simulator on host machine. Some benefits of using this simulator approach: - No need to use a target device at all. Save developers from solving the device troubles: build, flash, usb, adb, etc. - Speed up development/debug/test cycle. - Allows easy debugging/testing new instruction features without real hardware. - Allows using a smaller AOSP Android manifest master-art. The Stage1 CL provides support for running 30% of current run-tests. The rest unsupported test cases are kept in knownfailures.json. Future work will be supporting proper stack frame layout between simulator and quick entrypoints, so that stack walk, QuickArgumentVisitor, deoptimization, etc can be supported. This CL adds libart(d)-simulator-container library to the ART APEX. It has caused the following increase of the APEX size (small, about 0.13% for release APEX, measured for target aosp_arm64-userdebug): Before: 88992 com.android.art.debug.apex 51612 com.android.art.release.apex 112352 com.android.art.testing.apex After: 89124 com.android.art.debug.apex 51680 com.android.art.release.apex 112468 com.android.art.testing.apex Change-Id: I461c80aa9c4ce0673eef1c0254d2c539f2b6a8d5 Test: art/test.py --run-test --optimizing --simulate-arm64 Test: art/test.py --run-test --optimizing --host Test: m test-art-host-gtest
Diffstat (limited to 'test/testrunner/testrunner.py')
-rwxr-xr-xtest/testrunner/testrunner.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index b8e8cb7808..f547681e62 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -182,7 +182,7 @@ def gather_test_info():
global TOTAL_VARIANTS_SET
# TODO: Avoid duplication of the variant names in different lists.
VARIANT_TYPE_DICT['run'] = {'ndebug', 'debug'}
- VARIANT_TYPE_DICT['target'] = {'target', 'host', 'jvm'}
+ VARIANT_TYPE_DICT['target'] = {'target', 'host', 'jvm', 'simulate-arm64'}
VARIANT_TYPE_DICT['trace'] = {'trace', 'ntrace', 'stream'}
VARIANT_TYPE_DICT['image'] = {'picimage', 'no-image'}
VARIANT_TYPE_DICT['debuggable'] = {'ndebuggable', 'debuggable'}
@@ -254,6 +254,7 @@ def setup_test_env():
_user_input_variants['address_sizes_target'] = collections.defaultdict(set)
if not _user_input_variants['address_sizes']:
+ _user_input_variants['address_sizes_target']['simulate-arm64'].add('64')
_user_input_variants['address_sizes_target']['target'].add(
env.ART_PHONY_TEST_TARGET_SUFFIX)
_user_input_variants['address_sizes_target']['host'].add(
@@ -423,6 +424,8 @@ def run_tests(tests):
if target == 'host':
options_test += ' --host'
+ elif target == 'simulate-arm64':
+ options_test += ' --host --simulate-arm64'
elif target == 'jvm':
options_test += ' --jvm'