From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 10 Feb 2021 09:16:09 +0000 (+0100)
Subject: test: count call instructions as well
X-Git-Tag: v248-rc1~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2de908aead1182e07851e05b9f31759fe445e4f5;p=thirdparty%2Fsystemd.git

test: count call instructions as well

Binaries on the latest Arch Linux use `call` instructions instead of
`callq`, which breaks the ASan detection and eventually the image
building process (due to insufficient space).
---

diff --git a/test/test-functions b/test/test-functions
index df6022982c2..44696aff3b7 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -182,7 +182,7 @@ is_built_with_asan() {
     fi
 
     # Borrowed from https://github.com/google/oss-fuzz/blob/cd9acd02f9d3f6e80011cc1e9549be526ce5f270/infra/base-images/base-runner/bad_build_check#L182
-    local _asan_calls=$(objdump -dC $SYSTEMD_JOURNALD | egrep "callq\s+[0-9a-f]+\s+<__asan" -c)
+    local _asan_calls=$(objdump -dC $SYSTEMD_JOURNALD | egrep "callq?\s+[0-9a-f]+\s+<__asan" -c)
     if (( $_asan_calls < 1000 )); then
         return 1
     else