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

Merge "When merging tests, prefer non-blocklisted ones." am: 14b71a757b am: f6d0a0664a am: 8d835765f5

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

Change-Id: Id6e64519ed71161e8856df6e496ea40ce04d526b
This commit is contained in:
Joel Galenson
2021-07-16 18:15:47 +00:00
committed by Automerger Merge Worker
parent efe89c3d05 8d835765f5
commit 58baa3c20b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/cargo2android.py
View File

@@ -304,6 +304,9 @@ class Crate(object):
# which can be changed if self is a merged test module.
self.decide_module_type()
if should_merge_test:
if (self.main_src in self.runner.args.test_blocklist and
not other.main_src in self.runner.args.test_blocklist):
self.main_src = other.main_src
self.srcs.append(other.main_src)
# use a short unique name as the merged module name.
prefix = self.root_pkg + '_tests'