Merge changes Ie8ff0e35,I4aebdb5e,I4d9b906f am: 270633f6ca
Original change: https://android-review.googlesource.com/c/platform/development/+/2125661 Change-Id: I3668e64a68a4d0a97c7c163a2c7f5e97a336f9be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -82,6 +82,10 @@ TEST_EXCLUDE = [
|
|||||||
|
|
||||||
# TODO: Remove when b/198197213 is closed.
|
# TODO: Remove when b/198197213 is closed.
|
||||||
"diced_client_test",
|
"diced_client_test",
|
||||||
|
|
||||||
|
"CoverageRustSmokeTest",
|
||||||
|
"libtrusty-rs-tests",
|
||||||
|
"terminal-size_test_src_lib",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Excluded modules.
|
# Excluded modules.
|
||||||
@@ -294,6 +298,12 @@ class TestMapping(object):
|
|||||||
continue
|
continue
|
||||||
if test not in config['postsubmit_tests'] and 'postsubmit' in test_group:
|
if test not in config['postsubmit_tests'] and 'postsubmit' in test_group:
|
||||||
continue
|
continue
|
||||||
|
else:
|
||||||
|
if 'postsubmit' in test_group:
|
||||||
|
# If postsubmit_tests is not configured, do not place
|
||||||
|
# anything in postsubmit - presubmit groups are
|
||||||
|
# automatically included in postsubmit in CI.
|
||||||
|
continue
|
||||||
if test in TEST_OPTIONS:
|
if test in TEST_OPTIONS:
|
||||||
test_mapping[test_group].append({"name": test, "options": TEST_OPTIONS[test]})
|
test_mapping[test_group].append({"name": test, "options": TEST_OPTIONS[test]})
|
||||||
else:
|
else:
|
||||||
@@ -352,7 +362,10 @@ def main():
|
|||||||
subprocess.check_output(['repo', 'start',
|
subprocess.check_output(['repo', 'start',
|
||||||
'tmp_auto_test_mapping', '.'])
|
'tmp_auto_test_mapping', '.'])
|
||||||
subprocess.check_output(['git', 'add', 'TEST_MAPPING'])
|
subprocess.check_output(['git', 'add', 'TEST_MAPPING'])
|
||||||
subprocess.check_output(['git', 'add', 'test_mapping_config.json'])
|
# test_mapping_config.json is not always present
|
||||||
|
subprocess.call(['git', 'add', 'test_mapping_config.json'],
|
||||||
|
stderr=subprocess.DEVNULL,
|
||||||
|
stdout=subprocess.DEVNULL)
|
||||||
subprocess.check_output(['git', 'commit', '-m',
|
subprocess.check_output(['git', 'commit', '-m',
|
||||||
'Update TEST_MAPPING\n\nTest: None'])
|
'Update TEST_MAPPING\n\nTest: None'])
|
||||||
if args.push_change and (changed or untracked):
|
if args.push_change and (changed or untracked):
|
||||||
|
|||||||
Reference in New Issue
Block a user