From 771fcecf4844ee99c4c36158c99be6d111d77815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Jan 2023 11:05:31 +0100 Subject: [PATCH] CI: Don't use % in --define (it might have side effects) --- tests/include-frame-pointers/runtest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/include-frame-pointers/runtest.sh b/tests/include-frame-pointers/runtest.sh index f91ccec..c00b31a 100755 --- a/tests/include-frame-pointers/runtest.sh +++ b/tests/include-frame-pointers/runtest.sh @@ -33,22 +33,22 @@ for arch in aarch64 armv7hl x86_64 ppc64le riscv64; do ;; esac - rpmeval --target="${arch}-linux" --define='%_include_frame_pointers 1' | grep -q -- "$flags" + rpmeval --target="${arch}-linux" --define='_include_frame_pointers 1' | grep -q -- "$flags" validate "[${arch}] Test that the flags are included if the macro is defined" rpmeval --target="${arch}-linux" --undefine='_include_frame_pointers' | grep -qv -- "$flags" validate "[${arch}] Test that the flags are _not_ included if the macro is undefined" - rpmeval --target="${arch}-linux" --define="%fedora 1" | grep -q -- "$flags" + rpmeval --target="${arch}-linux" --define='fedora 1' | grep -q -- "$flags" validate "[${arch}] Test that the flags are included by default on Fedora" - rpmeval --target="${arch}-linux" --define="%rhel 1" | grep -qv -- "$flags" + rpmeval --target="${arch}-linux" --define='rhel 1' | grep -qv -- "$flags" validate "[${arch}] Test that the flags are _not_ included by default on RHEL" done flags='-fno-omit-frame-pointer' for arch in i386 i486 i586 i686 athlon s390x; do - rpmeval --target="${arch}-linux" --define='%_include_frame_pointers 1' | grep -qv -- "$flags" + rpmeval --target="${arch}-linux" --define='_include_frame_pointers 1' | grep -qv -- "$flags" validate "[${arch}] Test that the flags are not included if the macro is defined" rpmeval --target="${arch}-linux" | grep -qv -- "$flags"