From 2d50e3c7bc20bcb15040bfef67131903250fb8d9 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 8 Aug 2021 19:33:10 +0200 Subject: [PATCH 1/2] test: yet another fix for ASan detection This time for ppc64le: ``` 100737c4: 5d 55 f9 4b bl 10008d20 <00000024.plt_call.__asan_report_load8> 100737f4: 4d 55 f9 4b bl 10008d40 <00000024.plt_call.__asan_handle_no_return> 10073884: 5d 50 f9 4b bl 100088e0 <00000024.plt_call.__asan_init> 1007388c: 75 54 f9 4b bl 10008d00 <00000024.plt_call.__asan_version_mismatch_check_v8> 100738a0: 41 36 f9 4b bl 10006ee0 <00000024.plt_call.__asan_register_globals> 100738f0: 71 4c f9 4b bl 10008560 <00000024.plt_call.__asan_unregister_globals> ``` --- test/test-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-functions b/test/test-functions index c049d4b64a..c4e812a03f 100644 --- a/test/test-functions +++ b/test/test-functions @@ -229,7 +229,7 @@ is_built_with_asan() { # Borrowed from https://github.com/google/oss-fuzz/blob/cd9acd02f9d3f6e80011cc1e9549be526ce5f270/infra/base-images/base-runner/bad_build_check#L182 local _asan_calls - _asan_calls="$(objdump -dC "$SYSTEMD_JOURNALD" | grep -E "(callq?|brasl?)\s+[^ <]+\s+<__asan" -c)" + _asan_calls="$(objdump -dC "$SYSTEMD_JOURNALD" | grep -E "(callq?|brasl?|bl)\s.+__asan" -c)" if ((_asan_calls < 1000)); then return 1 else From 25e399948bce6a2877da171892ba522a7b82bf44 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 8 Aug 2021 19:42:25 +0200 Subject: [PATCH 2/2] test: make busybox TEST-13-only dependency to make running other tests a bit easier on distributions which don't have busybox in repositories (CentOS). --- test/TEST-13-NSPAWN-SMOKE/test.sh | 1 + test/test-functions | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh index 352f00682b..8455cc60ad 100755 --- a/test/TEST-13-NSPAWN-SMOKE/test.sh +++ b/test/TEST-13-NSPAWN-SMOKE/test.sh @@ -11,6 +11,7 @@ TEST_NO_NSPAWN=1 test_append_files() { ( local workspace="${1:?}" + dracut_install busybox if selinuxenabled >/dev/null; then dracut_install selinuxenabled diff --git a/test/test-functions b/test/test-functions index c4e812a03f..882d0715c3 100644 --- a/test/test-functions +++ b/test/test-functions @@ -126,7 +126,6 @@ BASICTOOLS=( base64 basename bash - busybox capsh cat chmod