LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add --no-presubmit option to prevent host tests being run in presubmit." am: 10d2ee6c3d am: d4619f1a0d am: d8d78c83b3 am: b24c9733af

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1942517

Change-Id: I4ecbcec4881d70ee7a01b76413ed57c13b66c2c7
This commit is contained in:
Andrew Walbran
2022-01-10 18:53:11 +00:00
committed by Automerger Merge Worker
parent 599eb35d2b b24c9733af
commit eef23c2874
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/cargo2android.py
View File

@@ -896,7 +896,10 @@ class Crate(object):
self.write(' auto_gen_config: true,') self.write(' auto_gen_config: true,')
if 'test' in self.crate_types and self.host_supported: if 'test' in self.crate_types and self.host_supported:
self.write(' test_options: {') self.write(' test_options: {')
self.write(' unit_test: true,') if self.runner.args.no_presubmit:
self.write(' unit_test: false,')
else:
self.write(' unit_test: true,')
self.write(' },') self.write(' },')
def dump_android_externs(self): def dump_android_externs(self):
@@ -1668,6 +1671,11 @@ def get_parser():
action='store_true', action='store_true',
default=False, default=False,
help='do not run cargo for the host; only for the device target') help='do not run cargo for the host; only for the device target')
parser.add_argument(
'--no-presubmit',
action='store_true',
default=False,
help='set unit_test to false for test targets, to avoid host tests running in presubmit')
parser.add_argument( parser.add_argument(
'--no-subdir', '--no-subdir',
action='store_true', action='store_true',