November 2022 - flashrom-gerrit

[S] Change in flashrom[master]: tests: Add llvm-cov optio and run target for code coverage
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69268 ) Change subject: tests: Add llvm-cov optio and run target for code coverage ...................................................................... tests: Add llvm-cov optio and run target for code coverage Code coverage can be requested with -Dllvm_cov and run with ninja llvm-cov. BUG=b:187647884 BRANCH=None TEST=meson test; ninja llvm-cov Change-Id: Id6c73bff46e7b88d425956a80def97082b201f56 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M Documentation/building.md M meson.build M meson_options.txt A scripts/llvm-cov 4 files changed, 40 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/69268/1 diff --git a/Documentation/building.md b/Documentation/building.md index 445fd65..9893512 100644 --- a/Documentation/building.md +++ b/Documentation/building.md @@ -60,12 +60,9 @@ #### llvm https://clang.llvm.org/docs/SourceBasedCodeCoverage.html ``` -env CFLAGS="-fprofile-instr-generate -fcoverage-mapping" CC=clang meson setup buildclangcov -env LLVM_PROFILE_FILE=default.profraw ninja -C buildclangcov test -cd buildclangcov -llvm-profdata merge -sparse default.profraw -o default.profdata -llvm-cov show ./flashrom_unit_tests -instr-profile=default.profdata --format=html --output-dir=. -open index.html +env CC=clang meson setup buildclangcov -Dllvm_cov=true +ninja -C buildclangcov test +ninja -C buildclangcov llvm-cov ``` ## System specific information diff --git a/meson.build b/meson.build index 81c7190..3fa8ab8 100644 --- a/meson.build +++ b/meson.build @@ -47,6 +47,7 @@ config_default_programmer_args = get_option('default_programmer_args') cargs = [] +link_args = [] deps = [] srcs = files( '82802ab.c', @@ -530,6 +531,11 @@ cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS="' + config_default_programmer_args + '"' +if get_option('llvm_cov') + cargs += ['-fprofile-instr-generate', '-fcoverage-mapping'] + link_args += ['-fprofile-instr-generate', '-fcoverage-mapping'] +endif + install_headers([ 'include/libflashrom.h', ], @@ -558,7 +564,7 @@ cargs, ], install : true, - link_args : vflag, + link_args : link_args + [vflag], link_depends : mapfile, ) @@ -602,6 +608,7 @@ include_directories : include_dir, install : true, install_dir : get_option('sbindir'), + link_args : link_args, link_with : libflashrom.get_static_lib(), # flashrom needs internal symbols of libflashrom ) endif @@ -745,10 +752,14 @@ '-fdata-sections', ], export_dynamic : true, - link_args : mocks, + link_args : mocks + link_args, dependencies : [cmocka_dep, flashrom_test_dep], ) test('cmocka test flashrom', flashrom_tests, timeout: 60) + + if get_option('llvm_cov') + run_target('llvm-cov', command : ['scripts/llvm-cov', flashrom_tests]) + endif endif programmer_names_active = [] diff --git a/meson_options.txt b/meson_options.txt index 8c04029..fcab26a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,3 +16,4 @@ 'pickit2_spi', 'pony_spi', 'raiden_debug_spi', 'rayer_spi', 'realtek_mst_i2c_spi', 'satamv', 'satasii', 'serprog', 'stlinkv3_spi', 'usbblaster_spi', ], description: 'Active programmers') +option('llvm_cov', type : 'boolean', value : 'false', description : 'build for llvm code coverage') diff --git a/scripts/llvm-cov b/scripts/llvm-cov new file mode 100755 index 0000000..b512b3d --- /dev/null +++ b/scripts/llvm-cov @@ -0,0 +1,6 @@ +#!/bin/sh + +cd "${MESON_BUILD_ROOT}" +llvm-profdata merge -sparse default.profraw -o default.profdata +llvm-cov show -instr-profile=default.profdata -format=html -output-dir=. "$@" +echo "file://${MESON_BUILD_ROOT}/index.html" -- To view, visit https://review.coreboot.org/c/flashrom/+/69268 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id6c73bff46e7b88d425956a80def97082b201f56 Gerrit-Change-Number: 69268 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: layout: Factor out flash_region structure from romentry
by Edward O'Callaghan (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Angel Pons. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69196 ) Change subject: layout: Factor out flash_region structure from romentry ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: > What benefit does this provide? That's a good question since this patch on its own doesn't have any extra context. I'll leave this space for Nik to fill in and flesh out as it's his project but just wanted to get him started here. The tl;dr is to get the Intel CSME co-processor to work properly in the writeprotect/layout frameworks. This patch almost stands on its own merit but just needs some more context. Over to you Nik possibly with a topic and some follow up patches? File include/layout.h: https://review.coreboot.org/c/flashrom/+/69196/comment/e959c942_88deb8ca PS2, Line 42: bool read_prot; : bool write_prot; @Nik, when you hijack this patch maybe drop these in this patch and add in a subsequent patch when you need them. -- To view, visit https://review.coreboot.org/c/flashrom/+/69196 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I768742b73db901df5b5208fcbcb8a324a06014c2 Gerrit-Change-Number: 69196 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 07 Nov 2022 02:58:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tests: Detect llvm-cov file io and unmock io functions
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Anastasia Klimchuk. Evan Benn has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69267 ) Change subject: tests: Detect llvm-cov file io and unmock io functions ...................................................................... Patch Set 3: (1 comment) File tests/tests.c: https://review.coreboot.org/c/flashrom/+/69267/comment/987b98d2_5beaa894 PS3, Line 140: if (!check_suffix(pathname, ".gcda") || !check_suffix(pathname, ".profraw")) strangely llvm uses fopen in my ubuntu, but uses open in chromeos. Maybe different llvm / libc versions. -- To view, visit https://review.coreboot.org/c/flashrom/+/69267 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I21cc1d631e92fa19006b967e85676f108e80b307 Gerrit-Change-Number: 69267 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 07 Nov 2022 02:30:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tests: Detect llvm-cov file io and unmock io functions
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Anastasia Klimchuk. Hello build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69267 to look at the new patch set (#3). Change subject: tests: Detect llvm-cov file io and unmock io functions ...................................................................... tests: Detect llvm-cov file io and unmock io functions Code coverage writes data to disk atexit of the program. We need to unmock the file io at this point so that the data is really written. BUG=b:187647884 BRANCH=None TEST=meson test TEST=llvm-profdata merge -sparse default.profraw -o default.profdata TEST=llvm-cov show ./flashrom_unit_tests -instr-profile=default.profdata --format=html --output-dir=. Change-Id: I21cc1d631e92fa19006b967e85676f108e80b307 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M Documentation/building.md M tests/tests.c M tests/wraps.h 3 files changed, 56 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/69267/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/69267 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I21cc1d631e92fa19006b967e85676f108e80b307 Gerrit-Change-Number: 69267 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tests: Detect gcov file io and unmock io functions
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Anastasia Klimchuk. Hello build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69266 to look at the new patch set (#3). Change subject: tests: Detect gcov file io and unmock io functions ...................................................................... tests: Detect gcov file io and unmock io functions Code coverage writes data to disk atexit of the program. We need to unmock the file io at this point so that the data is really written. BUG=b:187647884 BRANCH=None TEST=meson test TEST=ninja coverage Change-Id: If06053ecd78e886c8f7fc55813f4b5635be78c6b Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M Documentation/building.md M tests/io_mock.h M tests/tests.c M tests/wraps.h 4 files changed, 82 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/69266/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/69266 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If06053ecd78e886c8f7fc55813f4b5635be78c6b Gerrit-Change-Number: 69266 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tests: Detect gcov file io and unmock io functions
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Anastasia Klimchuk. Hello build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69266 to look at the new patch set (#2). Change subject: tests: Detect gcov file io and unmock io functions ...................................................................... tests: Detect gcov file io and unmock io functions Code coverage writes data to disk atexit of the program. We need to unmock the file io at this point so that the data is really written. BUG=b:187647884 BRANCH=None TEST=meson test TEST=ninja coverage Change-Id: If06053ecd78e886c8f7fc55813f4b5635be78c6b Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M Documentation/building.md M tests/io_mock.h M tests/tests.c M tests/wraps.h 4 files changed, 80 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/69266/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/69266 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If06053ecd78e886c8f7fc55813f4b5635be78c6b Gerrit-Change-Number: 69266 Gerrit-PatchSet: 2 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[L] Change in flashrom[master]: meson: Move meson tests config to top level build file
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Hello build bot (Jenkins), Thomas Heijligen, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69265 to look at the new patch set (#2). Change subject: meson: Move meson tests config to top level build file ...................................................................... meson: Move meson tests config to top level build file meson has a bug with code coverage, moving the test to the top level build file works around this bug. https://github.com/mesonbuild/meson/issues/6747 BUG=b:187647884 BRANCH=None TEST=meson test Change-Id: Ibba93037831fc0ed526f701cbe360b5a493895d1 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M meson.build D tests/meson.build 2 files changed, 131 insertions(+), 126 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/65/69265/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/69265 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibba93037831fc0ed526f701cbe360b5a493895d1 Gerrit-Change-Number: 69265 Gerrit-PatchSet: 2 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: tests: Add prefix to io_mock functions not to clash with macros
by Anastasia Klimchuk (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Felix Singer, Thomas Heijligen. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68433 ) Change subject: tests: Add prefix to io_mock functions not to clash with macros ...................................................................... Patch Set 7: (3 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/68433/comment/5192d2f8_becdb4e1 PS5, Line 13: stays > typo: stay (without s) Done https://review.coreboot.org/c/flashrom/+/68433/comment/8326775a_03b8cc92 PS5, Line 10: because the latter are allowed : to be macros. Adding a prefix to flashrom mock functions avoids : them being accidentally expanded. Standard I/O functions are : expanded and flashrom mocks stays as they are > Why is it a problem that standard IO functions are macros? <...> How does the prefix prevent that the flashrom mocks are expanded? The situation is: there are some functions which are allowed to be macros (standard I/O). Which means, the programmer code .c file can have for example `fopen(.....)` but then during pre-processing step `fopen` can be replaced with anything. It depends on the environment, but from the point of view of flashrom unit tests we don't know what `fopen` will be replaced with. And this is totally fine, because fopen is allowed to be a macro. Now, just by coincidence, we have function pointers in our io_mock framework, which have the same names as standard I/O. So we also have `fopen`, but it's a different one, it is a member of io_mock struct. However, because the name clashes, our own fopen from io_mock is also replaced together with fopen from standard I/O. This is wrong, and should not happen. The name clash is a coincidence, there are no reasons for the names from io_mock to be the same as standard I/O. We can have any names in io_mock. It makes sense to keep some reference between original and mock function, to have code more readable. This is why the idea was to add a prefix, `iom_`. With the prefix, names do not clash anymore. Function with name iom_fopen will not be replaced with fopen macro. This is what we need: original functions are pre-processed as needed, but functions in io_mock stay as is. > I don't understand the relation between that function pointer and the standard I/O functions. The relation is only logical, as the relation between original function and its custom mock. This is why we can add prefix and rename our function pointers in io_mock. > Shouldn't undefining _FORTIFY_SOURCE solve that problem? In my understanding standard I/O functions are not expanded when _FORTIFY_SOURCE is undefined. So just to re-iterate, we have two sets of functions in question: 1) standard I/O 2) flashrom own io_mock With the help of undefining _FORTIFY_SOURCE we can avoid one of the cases when standard I/O functions are not expanded. _FORTIFY_SOURCE helps to deal with one of the cases for 1) It is very convenient, because it reduces the number of wraps we need, less noise in the code, more readable code. This patch solves the problem for 2) In general, there could be many more different macro expansions, which are completely independent of _FORTIFY_SOURCE. And in general, we cannot block them, we actually want the all to work normally. However, we don't want our functions 2) to get expanded. So we make names not to clash and solve this. File tests/io_mock.h: https://review.coreboot.org/c/flashrom/+/68433/comment/bd584e3c_cd627f88 PS5, Line 73: /* Port I/O */ : void (*outb)(void *state, unsigned char value, unsigned short port); : unsigned char (*inb)(void *state, unsigned short port); : : void (*outw)(void *state, unsigned short value, unsigned short port); : unsigned short (*inw)(void *state, unsigned short port); : : void (*outl)(void *state, unsigned int value, unsigned short port); : unsigned int (*inl)(void *state, unsigned short port); : : /* USB I/O */ : int (*libusb_init)(void *state, libusb_context **ctx); : int (*libusb_control_transfer)(void *state, : libusb_device_handle *devh, : uint8_t bmRequestType, : uint8_t bRequest, : uint16_t wValue, : uint16_t wIndex, : unsigned char *data, : uint16_t wLength, : unsigned int timeout); : ssize_t (*libusb_get_device_list)(void *state, libusb_context *, libusb_device ***list); : void (*libusb_free_device_list)(void *state, libusb_device **list, int unref_devices); : int (*libusb_get_device_descriptor)(void *state, libusb_device *, struct libusb_device_descriptor *); : int (*libusb_get_config_descriptor)(void *state, : libusb_device *, : uint8_t config_index, : struct libusb_config_descriptor **); : void (*libusb_free_config_descriptor)(void *state, struct libusb_config_descriptor *); > I am wondering, should these functions be renamed as well? They could, but if they cannot ever be macros, then it doesn't matter. -- To view, visit https://review.coreboot.org/c/flashrom/+/68433 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7998a8fb1b9e65621e12adbfab5460a245d5606b Gerrit-Change-Number: 68433 Gerrit-PatchSet: 7 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Mon, 07 Nov 2022 02:20:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: meson: Move meson tests config to top level build file
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Evan Benn has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69265 ) Change subject: meson: Move meson tests config to top level build file ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This is not the greatest solution, but the only thing I found that worked. Without this we only get coverage for the tests/*.c files. Also tried : `CFLAGS="-fprofile-dir="(pwd)"/buildcov/cov" meson setup --wipe buildcov -Db_coverage=true`. That puts the gcda files in the right place, but then the `ninja coverage` step fails as the gcno files are still in the old place. The llvm code coverage does not need this patch. -- To view, visit https://review.coreboot.org/c/flashrom/+/69265 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibba93037831fc0ed526f701cbe360b5a493895d1 Gerrit-Change-Number: 69265 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 07 Nov 2022 02:13:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tests: Detect llvm-cov file io and unmock io functions
by Evan Benn (Code Review) 07 Nov '22

07 Nov '22

Attention is currently required from: Anastasia Klimchuk. Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69267 ) Change subject: tests: Detect llvm-cov file io and unmock io functions ...................................................................... tests: Detect llvm-cov file io and unmock io functions Code coverage writes data to disk atexit of the program. We need to unmock the file io at this point so that the data is really written. BUG=b:187647884 BRANCH=None TEST=meson test TEST=llvm-profdata merge -sparse default.profraw -o default.profdata TEST=llvm-cov show ./flashrom_unit_tests -instr-profile=default.profdata --format=html --output-dir=. Change-Id: I21cc1d631e92fa19006b967e85676f108e80b307 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M Documentation/building.md M tests/tests.c M tests/wraps.h 3 files changed, 57 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/69267/1 diff --git a/Documentation/building.md b/Documentation/building.md index 0e66f29..445fd65 100644 --- a/Documentation/building.md +++ b/Documentation/building.md @@ -49,12 +49,25 @@ ``` ### Run unit tests with code coverage + +#### gcc / gcov ``` meson setup buildcov -Db_coverage=true ninja -C buildcov test ninja -C buildcov coverage ``` +#### llvm +https://clang.llvm.org/docs/SourceBasedCodeCoverage.html +``` +env CFLAGS="-fprofile-instr-generate -fcoverage-mapping" CC=clang meson setup buildclangcov +env LLVM_PROFILE_FILE=default.profraw ninja -C buildclangcov test +cd buildclangcov +llvm-profdata merge -sparse default.profraw -o default.profdata +llvm-cov show ./flashrom_unit_tests -instr-profile=default.profdata --format=html --output-dir=. +open index.html +``` + ## System specific information ### Ubuntu / Debian (Linux) * __linux-headers__ are version specific diff --git a/tests/tests.c b/tests/tests.c index 1b5b6d6..8d72a99 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -32,6 +32,12 @@ return __real_open(pathname, flags, mode); } +static FILE *unwrap_fopen(void *state, const char *pathname, const char *mode) { + LOG_ME; + (void)state; + return __real_fopen(pathname, mode); +} + static FILE *unwrap_fdopen(void *state, int fd, const char *mode) { LOG_ME; (void)state; @@ -44,12 +50,20 @@ return __real_fwrite(ptr, size, nmemb, fp); } +static int unwrap_fclose(void *state, FILE *fp) { + LOG_ME; + (void)state; + return __real_fclose(fp); +} + // Mock ios that defer to the real io functions. // These exist so that code coverage can print to real files on disk. struct io_mock real_io_mock = { .open = unwrap_open, + .fopen = unwrap_fopen, .fwrite = unwrap_fwrite, .fdopen = unwrap_fdopen, + .fclose = unwrap_fclose, }; void *not_null(void) @@ -117,7 +131,8 @@ static int mock_open(const char *pathname, int flags, mode_t mode) { // We detect code coverage writing the log files and defer to real io functions. - if (!check_suffix(pathname, ".gcda")) { + if (!check_suffix(pathname, ".gcda") + || !check_suffix(pathname, ".profraw")) { io_mock_register(&real_io_mock); } @@ -191,6 +206,12 @@ FILE *__wrap_fopen(const char *pathname, const char *mode) { LOG_ME; + // We detect code coverage writing the log files and defer to real io functions. + if (!check_suffix(pathname, ".gcda") + || !check_suffix(pathname, ".profraw")) { + io_mock_register(&real_io_mock); + } + if (get_io() && get_io()->fopen) return get_io()->fopen(get_io()->state, pathname, mode); return not_null(); diff --git a/tests/wraps.h b/tests/wraps.h index 44f78f7..6d7d8fd 100644 --- a/tests/wraps.h +++ b/tests/wraps.h @@ -36,6 +36,7 @@ int __wrap_write(int fd, const void *buf, size_t sz); int __wrap_read(int fd, void *buf, size_t sz); FILE *__wrap_fopen(const char *pathname, const char *mode); +FILE *__real_fopen(const char *pathname, const char *mode); FILE *__wrap_fopen64(const char *pathname, const char *mode); FILE *__wrap_fdopen(int fd, const char *mode); FILE *__real_fdopen(int fd, const char *mode); @@ -60,6 +61,7 @@ int __real_fprintf(FILE *fp, const char *fmt, ...); int __wrap___vfprintf_chk(FILE *fp, const char *fmt, va_list args); int __wrap_fclose(FILE *fp); +int __real_fclose(FILE *fp); int __wrap_feof(FILE *fp); int __wrap_ferror(FILE *fp); void __wrap_clearerr(FILE *fp); -- To view, visit https://review.coreboot.org/c/flashrom/+/69267 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I21cc1d631e92fa19006b967e85676f108e80b307 Gerrit-Change-Number: 69267 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit November 2022