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

update_crate_tests: fail gracefully

Browse Source 
Allow this script to accept a path to the crate being updated.
This allows it to be run separately from cargo2android.

Also, fail gracefully on error. TEST_MAPPING update failures should
not block crate updates.

Test: tools/external_updater/updater.sh update rust/crates/libc
Bug: 179132533
Change-Id: I3a4229f479ab3d2793df16b470f0a0632b9ee495
This commit is contained in:
Jeff Vander Stoep
2021-02-03 18:52:42 +01:00
parent 8aedba5144
commit 1b24dc3f71
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/cargo2android.py
View File

@@ -1152,7 +1152,7 @@ class Runner(object):
if self.dry_run: if self.dry_run:
print('Dry-run skip dump of TEST_MAPPING') print('Dry-run skip dump of TEST_MAPPING')
else: else:
test_mapping = TestMapping() test_mapping = TestMapping(None)
for bp_file_name in self.bp_files: for bp_file_name in self.bp_files:
test_mapping.create_test_mapping(os.path.dirname(bp_file_name)) test_mapping.create_test_mapping(os.path.dirname(bp_file_name))
return self return self

37
scripts/update_crate_tests.py
View File

@@ -33,22 +33,31 @@ exclude_paths = [
] ]
class Env(object): class Env(object):
def __init__(self): def __init__(self, path):
try: try:
self.ANDROID_BUILD_TOP = os.environ['ANDROID_BUILD_TOP'] self.ANDROID_BUILD_TOP = os.environ['ANDROID_BUILD_TOP']
except: except:
sys.exit('ERROR: this script must be run from an Android tree.') sys.exit('ERROR: this script must be run from an Android tree.')
self.cwd = os.getcwd() if path == None:
self.cwd_relative = self.cwd.split(self.ANDROID_BUILD_TOP)[1] self.cwd = os.getcwd()
else:
self.cwd = path
try:
self.cwd_relative = self.cwd.split(self.ANDROID_BUILD_TOP)[1]
except:
sys.exit("Exit if we're not being run from a Rust dir.")
class Bazel(object): class Bazel(object):
# set up the Bazel queryview # set up the Bazel queryview
def __init__(self, env): def __init__(self, env):
os.chdir(env.ANDROID_BUILD_TOP) os.chdir(env.ANDROID_BUILD_TOP)
if not os.path.exists("out/soong/queryview"): print("Building Bazel Queryview. This can take a couple of minutes...")
print("Building Bazel Queryview. This can take a couple of minutes...") cmd = "./build/soong/soong_ui.bash --build-mode --all-modules --dir=. queryview"
cmd = "./build/soong/soong_ui.bash --build-mode --all-modules --dir=. queryview" try:
subprocess.check_output(cmd, shell=True) out = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
print("Error: Unable to update TEST_MAPPING due to the following build error:")
sys.exit(e.output)
os.chdir(env.cwd) os.chdir(env.cwd)
def path(self): def path(self):
@@ -90,7 +99,6 @@ class Bazel(object):
# Return all reverse dependency tests for modules in this package. # Return all reverse dependency tests for modules in this package.
def query_rdep_tests(self, modules): def query_rdep_tests(self, modules):
rdep_tests = set() rdep_tests = set()
print("Querying tests that depend on this crate for TEST_MAPPING. This can take a couple of minutes...")
for module in modules: for module in modules:
for rdep in self.query_rdeps(module): for rdep in self.query_rdeps(module):
rule_type, tmp, mod = rdep.split(" ") rule_type, tmp, mod = rdep.split(" ")
@@ -110,8 +118,8 @@ class Crate(object):
class TestMapping(object): class TestMapping(object):
def __init__(self): def __init__(self, path):
self.env = Env() self.env = Env(path)
self.bazel = Bazel(self.env) self.bazel = Bazel(self.env)
def create_test_mapping(self, path): def create_test_mapping(self, path):
@@ -141,12 +149,17 @@ class TestMapping(object):
def write_test_mapping(self, test_mapping): def write_test_mapping(self, test_mapping):
with open("TEST_MAPPING", "w") as json_file: with open("TEST_MAPPING", "w") as json_file:
json_file.write("// Generated by cargo2android.py for tests that depend on this crate.\n") json_file.write("// Generated by update_crate_tests.py for tests that depend on this crate.\n")
json.dump(test_mapping, json_file, indent=2, separators=(',', ': '), sort_keys=True) json.dump(test_mapping, json_file, indent=2, separators=(',', ': '), sort_keys=True)
json_file.write("\n") json_file.write("\n")
print("TEST_MAPPING successfully updated!")
def main(): def main():
TestMapping().create_test_mapping(None) if len(sys.argv) == 2:
path = sys.argv[1]
else:
path = None
TestMapping(path).create_test_mapping(None)
if __name__ == '__main__': if __name__ == '__main__':
main() main()