Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/59858 )
Change subject: tests: Fix objcopy --add-symbol arguments creation ......................................................................
tests: Fix objcopy --add-symbol arguments creation
Remove unnecessary escape bachslashes from: addr="$(echo "$$$$sym_line" ... The 'echo' will print output line with double quote characters, which then will be included in the values passed to --add-symbol. This can cause errors.
Change-Id: I6023515191d6c236bf57870159a35d518f25e9d8 Reported-by: Yu-Ping Wu yupingso@chromium.org Signed-off-by: Jakub Czapiga jacz@semihalf.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/59858 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Yu-Ping Wu yupingso@google.com --- M payloads/libpayload/tests/Makefile.inc M tests/Makefile.inc 2 files changed, 6 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Yu-Ping Wu: Looks good to me, approved
diff --git a/payloads/libpayload/tests/Makefile.inc b/payloads/libpayload/tests/Makefile.inc index c4463d7..bf484bb 100644 --- a/payloads/libpayload/tests/Makefile.inc +++ b/payloads/libpayload/tests/Makefile.inc @@ -141,8 +141,8 @@ sym_line="$$$$($(HOSTOBJDUMP) -t $$@.orig \ | grep -E "[0-9a-fA-F]+\s+w\s+F\s+.*\s+$$$$sym$$$$")"; \ if [ ! -z "$$$$sym_line" ] ; then \ - addr="$$$$(echo "$$$$sym_line" | awk '{ print $$$$1 }')"; \ - section="$$$$(echo "$$$$sym_line" | awk '{ print $$$$(NF - 2) }')"; \ + addr="$$$$(echo "$$$$sym_line" | awk '{ print $$$$1 }')"; \ + section="$$$$(echo "$$$$sym_line" | awk '{ print $$$$(NF - 2) }')"; \ objcopy_wrap_flags="$$$$objcopy_wrap_flags --add-symbol __real_$$$${sym}=$$$${section}:0x$$$${addr},function,global"; \ fi \ done ; \ diff --git a/tests/Makefile.inc b/tests/Makefile.inc index 7a7ab1d..cbaf2c2 100644 --- a/tests/Makefile.inc +++ b/tests/Makefile.inc @@ -156,10 +156,11 @@ -MF $$(basename $$@).d -MT $$@ -c $$< -o $$@.orig objcopy_wrap_flags=''; \ for sym in $$($(1)-mocks); do \ - sym_line="$$$$($(OBJDUMP) -t $$@.orig | grep -E "[0-9a-fA-F]+\s+w\s+F\s+.*\s$$$$sym$$$$")"; \ + sym_line="$$$$($(OBJDUMP) -t $$@.orig \ + | grep -E "[0-9a-fA-F]+\s+w\s+F\s+.*\s$$$$sym$$$$")"; \ if [ ! -z "$$$$sym_line" ] ; then \ - addr="$$$$(echo "$$$$sym_line" | awk '{ print $$$$1 }')"; \ - section="$$$$(echo "$$$$sym_line" | awk '{ print $$$$(NF - 2) }')"; \ + addr="$$$$(echo "$$$$sym_line" | awk '{ print $$$$1 }')"; \ + section="$$$$(echo "$$$$sym_line" | awk '{ print $$$$(NF - 2) }')"; \ objcopy_wrap_flags="$$$$objcopy_wrap_flags --add-symbol __real_$$$${sym}=$$$${section}:0x$$$${addr},function,global"; \ fi \ done ; \