contrib: assume binary existence in sec/sym checks
If the binaries don't exist, the Guix build has failed for some other reason. There's no need to check for unknown architectures, or executable formats, as the only ones that could be built are those that we've configured toolchains for in Guix. We've also been doing this inconsistently across the two scripts.
This commit is contained in:
2 files changed
-23
No files matched your search
@@ -248,22 +248,11 @@ CHECKS = {
|
|||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
retval: int = 0
|
retval: int = 0
|
||||||
for filename in sys.argv[1:]:
|
for filename in sys.argv[1:]:
|
||||||
try:
|
|
||||||
binary = lief.parse(filename)
|
binary = lief.parse(filename)
|
||||||
etype = binary.format
|
etype = binary.format
|
||||||
arch = binary.abstract.header.architecture
|
arch = binary.abstract.header.architecture
|
||||||
binary.concrete
|
binary.concrete
|
||||||
|
|
||||||
if etype == lief.EXE_FORMATS.UNKNOWN:
|
|
||||||
print(f'{filename}: unknown executable format')
|
|
||||||
retval = 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
if arch == lief.ARCHITECTURES.NONE:
|
|
||||||
print(f'{filename}: unknown architecture')
|
|
||||||
retval = 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
failed: list[str] = []
|
failed: list[str] = []
|
||||||
for (name, func) in CHECKS[etype][arch]:
|
for (name, func) in CHECKS[etype][arch]:
|
||||||
if not func(binary):
|
if not func(binary):
|
||||||
@@ -271,8 +260,4 @@ if __name__ == '__main__':
|
|||||||
if failed:
|
if failed:
|
||||||
print(f'{filename}: failed {" ".join(failed)}')
|
print(f'{filename}: failed {" ".join(failed)}')
|
||||||
retval = 1
|
retval = 1
|
||||||
except IOError:
|
|
||||||
print(f'{filename}: cannot open')
|
|
||||||
retval = 1
|
|
||||||
sys.exit(retval)
|
sys.exit(retval)
|
||||||
|
|
||||||
@@ -299,13 +299,8 @@ lief.EXE_FORMATS.PE: [
|
|||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
retval: int = 0
|
retval: int = 0
|
||||||
for filename in sys.argv[1:]:
|
for filename in sys.argv[1:]:
|
||||||
try:
|
|
||||||
binary = lief.parse(filename)
|
binary = lief.parse(filename)
|
||||||
etype = binary.format
|
etype = binary.format
|
||||||
if etype == lief.EXE_FORMATS.UNKNOWN:
|
|
||||||
print(f'{filename}: unknown executable format')
|
|
||||||
retval = 1
|
|
||||||
continue
|
|
||||||
|
|
||||||
failed: list[str] = []
|
failed: list[str] = []
|
||||||
for (name, func) in CHECKS[etype]:
|
for (name, func) in CHECKS[etype]:
|
||||||
@@ -314,7 +309,4 @@ if __name__ == '__main__':
|
|||||||
if failed:
|
if failed:
|
||||||
print(f'{filename}: failed {" ".join(failed)}')
|
print(f'{filename}: failed {" ".join(failed)}')
|
||||||
retval = 1
|
retval = 1
|
||||||
except IOError:
|
|
||||||
print(f'{filename}: cannot open')
|
|
||||||
retval = 1
|
|
||||||
sys.exit(retval)
|
sys.exit(retval)
|
||||||
Reference in new issue
Block a user