March 2022 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: tests/: Factor out all link-time wrapped func
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62777 ) Change subject: tests/: Factor out all link-time wrapped func ...................................................................... Patch Set 2: (1 comment) File tests/wraps.c: https://review.coreboot.org/c/flashrom/+/62777/comment/afd29534_a8be13f0 PS2, Line 78: NON_ZERO Maybe rebase on top of CB:63193 -- To view, visit https://review.coreboot.org/c/flashrom/+/62777 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic5e18c9390c064a3112caa7f5778569ae478552d Gerrit-Change-Number: 62777 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 03:02:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests/: Factor out all link-time wrapped func
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62777 ) Change subject: tests/: Factor out all link-time wrapped func ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/62777 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic5e18c9390c064a3112caa7f5778569ae478552d Gerrit-Change-Number: 62777 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 03:01:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: use MOCK_FD instead of NON_ZERO
by Edward O'Callaghan (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Daniel Campello. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/63193 ) Change subject: tests: use MOCK_FD instead of NON_ZERO ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/63193 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib6bac051852aea2465665a6fd669b7f5e3772985 Gerrit-Change-Number: 63193 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Daniel Campello <campello(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 02:59:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests/: Factor out all link-time wrapped func
by Edward O'Callaghan (Code Review) 30 Mar '22

30 Mar '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/+/62777 to look at the new patch set (#2). Change subject: tests/: Factor out all link-time wrapped func ...................................................................... tests/: Factor out all link-time wrapped func Situate all the link-time wrapped functions into their own object file. This makes it easier to grok test code and keep all related harness supports together. BUG=b:217629892,b:215255210 TEST=`ninja test`. Change-Id: Ic5e18c9390c064a3112caa7f5778569ae478552d Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M tests/meson.build M tests/tests.c A tests/wraps.c 3 files changed, 333 insertions(+), 329 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/77/62777/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/62777 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic5e18c9390c064a3112caa7f5778569ae478552d Gerrit-Change-Number: 62777 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> 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

Change in flashrom[master]: tests/linux_spi: Validate param file path
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62319 ) Change subject: tests/linux_spi: Validate param file path ...................................................................... Patch Set 5: (1 comment) File tests/init_shutdown.c: https://review.coreboot.org/c/flashrom/+/62319/comment/ab1e4fed_ec327043 PS4, Line 39: #define DEFAULT_MOCK_FD 0xC0FE > NON_ZERO is a negative int... […] You can rebase on top of https://review.coreboot.org/c/flashrom/+/63193 -- To view, visit https://review.coreboot.org/c/flashrom/+/62319 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If5d24c65f291c53a35509fea5d2f5b3fdb51c306 Gerrit-Change-Number: 62319 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 02:53:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Daniel Campello <campello(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: use MOCK_FD instead of NON_ZERO
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Daniel Campello has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/63193 ) Change subject: tests: use MOCK_FD instead of NON_ZERO ...................................................................... tests: use MOCK_FD instead of NON_ZERO With this change the mocks are able to return a non-negative value for the file descriptor expected from open operations. This avoid issues with subsequent error checks of the form `if (fd < 0)` BUG=b:227404721 TEST=./test_build.sh; FEATURES=test emerge-amd64-generic flashrom BRANCH=none Signed-off-by: Daniel Campello <campello(a)chromium.org> Change-Id: Ib6bac051852aea2465665a6fd669b7f5e3772985 --- M tests/include/test.h M tests/lifecycle.c M tests/tests.c 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/63193/1 diff --git a/tests/include/test.h b/tests/include/test.h index bf8c4f7..88ac16d 100644 --- a/tests/include/test.h +++ b/tests/include/test.h @@ -29,6 +29,8 @@ #define NON_ZERO (0xf000baaa) +#define MOCK_FD (0x10ec) + /* * Having this as function allows to set a breakpoint on the address, * as it has a named symbol associated with the address number. diff --git a/tests/lifecycle.c b/tests/lifecycle.c index 282a6b5..c37f3b9 100644 --- a/tests/lifecycle.c +++ b/tests/lifecycle.c @@ -370,18 +370,16 @@ #endif } -#define REALTEK_MST_MOCK_FD 0x10ec - static int realtek_mst_open(void *state, const char *pathname, int flags) { assert_string_equal(pathname, "/dev/i2c-254"); assert_int_equal(flags & O_RDWR, O_RDWR); - return REALTEK_MST_MOCK_FD; + return MOCK_FD; } static int realtek_mst_ioctl(void *state, int fd, unsigned long request, va_list args) { - assert_int_equal(fd, REALTEK_MST_MOCK_FD); + assert_int_equal(fd, MOCK_FD); assert_int_equal(request, I2C_SLAVE); /* Only access to I2C address 0x4a is expected */ unsigned long addr = va_arg(args, unsigned long); @@ -392,14 +390,14 @@ static int realtek_mst_read(void *state, int fd, void *buf, size_t sz) { - assert_int_equal(fd, REALTEK_MST_MOCK_FD); + assert_int_equal(fd, MOCK_FD); assert_int_equal(sz, 1); return sz; } static int realtek_mst_write(void *state, int fd, const void *buf, size_t sz) { - assert_int_equal(fd, REALTEK_MST_MOCK_FD); + assert_int_equal(fd, MOCK_FD); const LargestIntegralType accepted_sizes[] = {1, 2}; assert_in_set(sz, accepted_sizes, ARRAY_SIZE(accepted_sizes)); return sz; diff --git a/tests/tests.c b/tests/tests.c index 33b2ea2..f32c14d 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -79,7 +79,7 @@ LOG_ME; if (get_io() && get_io()->open) return get_io()->open(get_io()->state, pathname, flags); - return NON_ZERO; + return MOCK_FD; } int __wrap_open64(const char *pathname, int flags) @@ -87,7 +87,7 @@ LOG_ME; if (get_io() && get_io()->open) return get_io()->open(get_io()->state, pathname, flags); - return NON_ZERO; + return MOCK_FD; } int __wrap___open64_2(const char *pathname, int flags) @@ -95,7 +95,7 @@ LOG_ME; if (get_io() && get_io()->open) return get_io()->open(get_io()->state, pathname, flags); - return NON_ZERO; + return MOCK_FD; } int __wrap_ioctl(int fd, unsigned long int request, ...) -- To view, visit https://review.coreboot.org/c/flashrom/+/63193 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib6bac051852aea2465665a6fd669b7f5e3772985 Gerrit-Change-Number: 63193 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Campello <campello(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests/: wrap flock() and ftruncate()
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62312 ) Change subject: tests/: wrap flock() and ftruncate() ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/62312 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I57e7843a4d94c0a7200690d4c1d9e4194b9f83c5 Gerrit-Change-Number: 62312 Gerrit-PatchSet: 7 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 02:39:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests/: Allow for file path validation
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62320 ) Change subject: tests/: Allow for file path validation ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: Why not change instead the default mock wrap in tests/tests.c for open and friends? -- To view, visit https://review.coreboot.org/c/flashrom/+/62320 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I892fa1ecee26ebce9640893edbb228fa9aa7b0b6 Gerrit-Change-Number: 62320 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Daniel Campello <campello(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 02:36:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests/realtek_mst: Allow test to check multiple paths
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62311 ) Change subject: tests/realtek_mst: Allow test to check multiple paths ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/62311 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I80d5e1fc26ad9caf49a98a7671d069bbd8428045 Gerrit-Change-Number: 62311 Gerrit-PatchSet: 8 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Daniel Campello <campello(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 02:33:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests/linux_mtd: Allow for checking open() calls
by Daniel Campello (Code Review) 30 Mar '22

30 Mar '22

Attention is currently required from: Edward O'Callaghan. Daniel Campello has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/62318 ) Change subject: tests/linux_mtd: Allow for checking open() calls ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: I suppose the intention here was to use the new fallback_open method here -- To view, visit https://review.coreboot.org/c/flashrom/+/62318 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I06e54c0bdc4f5320904e2ab6542345721f1ca370 Gerrit-Change-Number: 62318 Gerrit-PatchSet: 4 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Daniel Campello <campello(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 30 Mar 2022 02:32:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit March 2022