diff options
| -rwxr-xr-x | test/testrunner/run_build_test_target.py | 15 | ||||
| -rw-r--r-- | test/testrunner/target_config.py | 7 |
2 files changed, 21 insertions, 1 deletions
diff --git a/test/testrunner/run_build_test_target.py b/test/testrunner/run_build_test_target.py index 14287b0f16..b4a4ada506 100755 --- a/test/testrunner/run_build_test_target.py +++ b/test/testrunner/run_build_test_target.py @@ -62,6 +62,18 @@ custom_env['SOONG_ALLOW_MISSING_DEPENDENCIES'] = 'true' print(custom_env) os.environ.update(custom_env) +# build is just a binary/script that is directly executed to build any artifacts needed for the +# test. +if 'build' in target: + build_command = target.get('build').format( + ANDROID_BUILD_TOP = env.ANDROID_BUILD_TOP, + MAKE_OPTIONS='DX= -j{threads}'.format(threads = n_threads)) + sys.stdout.write(str(build_command) + '\n') + sys.stdout.flush() + if subprocess.call(build_command.split()): + sys.exit(1) + +# make runs soong/kati to build the target listed in the entry. if 'make' in target: build_command = 'build/soong/soong_ui.bash --make-mode' build_command += ' DX=' @@ -107,7 +119,8 @@ if 'run-test' in target: run_test_command += ['--host'] run_test_command += ['--dex2oat-jobs'] run_test_command += ['4'] - run_test_command += ['-b'] + if '--no-build-dependencies' not in test_flags: + run_test_command += ['-b'] run_test_command += ['--verbose'] sys.stdout.write(str(run_test_command) + '\n') diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py index 9efe435dc2..077129fa6c 100644 --- a/test/testrunner/target_config.py +++ b/test/testrunner/target_config.py @@ -329,4 +329,11 @@ target_config = { 'art-golem-linux-x64': { 'golem' : 'linux-x64' }, + 'art-linux-bionic-x64': { + 'build': '{ANDROID_BUILD_TOP}/art/tools/build_linux_bionic_tests.sh {MAKE_OPTIONS}', + 'run-test': ['--run-test-option=--bionic', + '--host', + '--64', + '--no-build-dependencies'], + }, } |