diff options
| author | Giuliano Procida <gprocida@google.com> | 2022-08-10 19:29:48 +0100 |
|---|---|---|
| committer | Giuliano Procida <gprocida@google.com> | 2022-08-11 15:35:04 +0000 |
| commit | 22fd9661146110a33137f415cb9d2bd9188cc05d (patch) | |
| tree | 2ec68c4b415ad9901230faea65b81a36e3d4f266 | |
| parent | 9f01685e70180ebcca3245afa85a8b72ac325972 (diff) | |
| download | build-22fd9661146110a33137f415cb9d2bd9188cc05d.tar.gz | |
abitool.py: simplify Delegated diff_abi code
Now that `abidiff` is no longer invoked, we can get rid of a bunch of
complexity that is no longer needed.
Bug: 228843807
Change-Id: Ic233a17e26e6e060da0ebebb865907a49f1437dd
Signed-off-by: Giuliano Procida <gprocida@google.com>
| -rw-r--r-- | abi/abitool.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/abi/abitool.py b/abi/abitool.py index ac8a934..3e483f7 100644 --- a/abi/abitool.py +++ b/abi/abitool.py @@ -15,7 +15,6 @@ # limitations under the License. # -import concurrent.futures import os import re import subprocess @@ -296,13 +295,7 @@ class Delegated(AbiTool): basename + ".short": stg_short, } - stgdiff_changed = None - with concurrent.futures.ThreadPoolExecutor() as executor: - # fork - stgdiff = executor.submit( - _run_stgdiff, old_dump, new_dump, stg_basename, symbol_list) - # join - stgdiff_changed = stgdiff.result() + changed = _run_stgdiff(old_dump, new_dump, stg_basename, symbol_list) print("ABI diff reports have been created") paths = [*(f"{stg_basename}.{format}" for format in STGDIFF_FORMATS)] @@ -312,19 +305,14 @@ class Delegated(AbiTool): for link, target in links.items(): _link_file(target, link) - changed = [] - if stgdiff_changed: - changed.append(("stgdiff", stg_short)) if changed: print() print("ABI DIFFERENCES HAVE BEEN DETECTED!") - for which, _ in changed: - print(f" by {which}") print() - with open(changed[0][1]) as input: + with open(stg_short) as input: print(input.read(), end="") - return True - return False + + return changed def get_abi_tool(abi_tool = "libabigail"): |