From 0a896424abd490d1cfdd8a582ba17c25df75a0e0 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Tue, 1 Nov 2022 14:32:51 +1100 Subject: tests: Undefine _FORTIFY_SOURCE for unit tests to avoid _chk variants The option _FORTIFY_SOURCE, when enabled, can result in some functions being expanded into _chk variants. For example, `fprintf` can get expanded into `__fprintf_chk`. This makes sense for building a real binary, but is not needed for unit tests. In unit test environment all those functions are wrapped. In the example above, both `fprintf` and `__fprintf_chk` needed to be mocked. Disabling _FORTIFY_SOURCE avoids expanding functions into _chk variants, without any loss of testing coverage because that would be wrapped/mocked anyway. This patch also removes two existing _chk wraps because they are not needed anymore. BUG=b:237606255 TEST=ninja test on 1) gcc 12.2.0 on Debian 2) clang 15.0 on Chromium OS Ticket: https://ticket.coreboot.org/issues/411 Change-Id: I70cb1cd90d1f377ff4606acad3c1b514120ae4f7 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/68432 Reviewed-by: Peter Marheine Reviewed-by: Felix Singer Tested-by: build bot (Jenkins) --- tests/meson.build | 3 +-- tests/tests.c | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/meson.build b/tests/meson.build index b0375a122..66adb92bd 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -69,9 +69,7 @@ mocks = [ '-Wl,--wrap=fsync', '-Wl,--wrap=fread', '-Wl,--wrap=fgets', - '-Wl,--wrap=__fgets_chk', '-Wl,--wrap=fprintf', - '-Wl,--wrap=__vfprintf_chk', '-Wl,--wrap=fclose', '-Wl,--wrap=feof', '-Wl,--wrap=ferror', @@ -115,6 +113,7 @@ flashrom_tests = executable('flashrom_unit_tests', cargs, '-ffunction-sections', '-fdata-sections', + '-U_FORTIFY_SOURCE', ], export_dynamic : true, link_args : mocks, diff --git a/tests/tests.c b/tests/tests.c index 53bad6569..77cb1effd 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -222,14 +222,6 @@ char *__wrap_fgets(char *buf, int len, FILE *fp) return NULL; } -char *__wrap___fgets_chk(char *buf, int len, FILE *fp) -{ - LOG_ME; - if (get_io() && get_io()->fgets) - return get_io()->fgets(get_io()->state, buf, len, fp); - return NULL; -} - size_t __wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *fp) { LOG_ME; @@ -282,14 +274,6 @@ int __wrap_fprintf(FILE *fp, const char *fmt, ...) return 0; } -int __wrap___vfprintf_chk(FILE *fp, const char *fmt, va_list args) -{ - LOG_ME; - if (get_io() && get_io()->fprintf) - return get_io()->fprintf(get_io()->state, fp, fmt, args); - return 0; -} - int __wrap_fclose(FILE *fp) { LOG_ME; -- cgit v1.2.3