November 2022 - flashrom-gerrit

[M] Change in flashrom[master]: writeprotect.c: skip unnecessary writes
by Anastasia Klimchuk (Code Review) 18 Nov '22

18 Nov '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66754 ) Change subject: writeprotect.c: skip unnecessary writes ...................................................................... writeprotect.c: skip unnecessary writes * Don't write register because of RO and OTP bits. * Skip the write of RW bits if register state wouldn't change by it. Change-Id: I81d2d3fc0a103ee00ced78838d77fe33a9d3056a Signed-off-by: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/66754 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> --- M writeprotect.c 1 file changed, 45 insertions(+), 17 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Nikolai Artemiev: Looks good to me, but someone else must approve diff --git a/writeprotect.c b/writeprotect.c index f72c362..3e8a836 100644 --- a/writeprotect.c +++ b/writeprotect.c @@ -110,12 +110,16 @@ /** Helper function for write_wp_bits(). */ static void set_reg_bit( - uint8_t *reg_values, uint8_t *write_masks, + uint8_t *reg_values, uint8_t *bit_masks, uint8_t *write_masks, struct reg_bit_info bit, uint8_t value) { if (bit.reg != INVALID_REG) { reg_values[bit.reg] |= value << bit.bit_index; - write_masks[bit.reg] |= 1 << bit.bit_index; + bit_masks[bit.reg] |= 1 << bit.bit_index; + + /* Avoid RO and OTP bits causing a register update */ + if (bit.writability == RW) + write_masks[bit.reg] |= 1 << bit.bit_index; } } @@ -125,22 +129,23 @@ size_t i; const struct reg_bit_map *reg_bits = &flash->chip->reg_bits; - /* Convert wp_bits to register values and write masks */ + /* Convert wp_bits to register values and masks */ uint8_t reg_values[MAX_REGISTERS] = {0}; - uint8_t write_masks[MAX_REGISTERS] = {0}; + uint8_t bit_masks[MAX_REGISTERS] = {0}; /* masks of valid bits */ + uint8_t write_masks[MAX_REGISTERS] = {0}; /* masks of written bits */ for (i = 0; i < bits.bp_bit_count; i++) - set_reg_bit(reg_values, write_masks, reg_bits->bp[i], bits.bp[i]); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->bp[i], bits.bp[i]); - set_reg_bit(reg_values, write_masks, reg_bits->tb, bits.tb); - set_reg_bit(reg_values, write_masks, reg_bits->sec, bits.sec); - set_reg_bit(reg_values, write_masks, reg_bits->cmp, bits.cmp); - set_reg_bit(reg_values, write_masks, reg_bits->srp, bits.srp); - set_reg_bit(reg_values, write_masks, reg_bits->srl, bits.srl); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->tb, bits.tb); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->sec, bits.sec); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->cmp, bits.cmp); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->srp, bits.srp); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->srl, bits.srl); /* Note: always setting WPS bit to zero until its fully supported. */ - set_reg_bit(reg_values, write_masks, reg_bits->wps, 0); + set_reg_bit(reg_values, bit_masks, write_masks, reg_bits->wps, 0); - /* Write each register */ + /* Write each register whose value was updated */ for (enum flash_reg reg = STATUS1; reg < MAX_REGISTERS; reg++) { if (!write_masks[reg]) continue; @@ -149,16 +154,22 @@ if (wp_read_register(flash, reg, &value)) return FLASHROM_WP_ERR_READ_FAILED; - value = (value & ~write_masks[reg]) | (reg_values[reg] & write_masks[reg]); + /* Skip unnecessary register writes */ + uint8_t actual = value & write_masks[reg]; + uint8_t expected = reg_values[reg] & write_masks[reg]; + if (actual == expected) + continue; + + value = (value & ~write_masks[reg]) | expected; if (wp_write_register(flash, reg, value)) return FLASHROM_WP_ERR_WRITE_FAILED; } enum flashrom_wp_result ret = FLASHROM_WP_OK; - /* Verify each register */ + /* Verify each register even if write to it was skipped */ for (enum flash_reg reg = STATUS1; reg < MAX_REGISTERS; reg++) { - if (!write_masks[reg]) + if (!bit_masks[reg]) continue; uint8_t value; @@ -166,8 +177,8 @@ return FLASHROM_WP_ERR_READ_FAILED; msg_cdbg2("%s: wp_verify reg:%u value:0x%x\n", __func__, reg, value); - uint8_t actual = value & write_masks[reg]; - uint8_t expected = reg_values[reg] & write_masks[reg]; + uint8_t actual = value & bit_masks[reg]; + uint8_t expected = reg_values[reg] & bit_masks[reg]; if (actual != expected) { msg_cdbg("%s: wp_verify failed: reg:%u actual:0x%x expected:0x%x\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/66754 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I81d2d3fc0a103ee00ced78838d77fe33a9d3056a Gerrit-Change-Number: 66754 Gerrit-PatchSet: 5 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: util/pkgbuilds: Add musl PKGBUILDs
by Felix Singer (Code Review) 18 Nov '22

18 Nov '22

Felix Singer has uploaded a new patch set (#2). ( https://review.coreboot.org/c/flashrom/+/69781 ) Change subject: util/pkgbuilds: Add musl PKGBUILDs ...................................................................... util/pkgbuilds: Add musl PKGBUILDs WIP Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I28f524a53897685ab763c48f8be5370b8f6488b6 --- A util/pkgbuilds/aarch64-linux-musl/PKGBUILD A util/pkgbuilds/riscv64-linux-musl/PKGBUILD 2 files changed, 102 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/81/69781/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/69781 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I28f524a53897685ab763c48f8be5370b8f6488b6 Gerrit-Change-Number: 69781 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: util/pkgbuilds: Add musl PKGBUILDs
by Felix Singer (Code Review) 18 Nov '22

18 Nov '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69781 ) Change subject: util/pkgbuilds: Add musl PKGBUILDs ...................................................................... util/pkgbuilds: Add musl PKGBUILDs WIP Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I28f524a53897685ab763c48f8be5370b8f6488b6 --- A util/pkgbuilds/aarch64-linux-musl/PKGBUILD 1 file changed, 57 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/81/69781/1 diff --git a/util/pkgbuilds/aarch64-linux-musl/PKGBUILD b/util/pkgbuilds/aarch64-linux-musl/PKGBUILD new file mode 100644 index 0000000..a579d69 --- /dev/null +++ b/util/pkgbuilds/aarch64-linux-musl/PKGBUILD @@ -0,0 +1,45 @@ +pkgname=aarch64-linux-musl +pkgver=1.2.3 +pkgrel=1 +pkgdesc='Lightweight implementation of C standard library' +arch=('x86_64') +url='https://musl.libc.org' +license=('MIT') +options=('staticlibs' '!buildflags' '!strip') +depends=('aarch64-linux-gnu-gcc') +validpgpkeys=('836489290BB6B70F99FFDA0556BCDB593020450F') +source=(https://musl.libc.org/releases/musl-${pkgver}.tar.gz{,.asc}) +sha256sums=('7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4' + 'SKIP') + +_target=aarch64-linux-gnu +_sysroot=/usr/${_target}/lib/musl + +build() { + cd musl-${pkgver} + ./configure \ + --prefix=${_sysroot} \ + --exec-prefix=/usr \ + --target=${_target} \ + --enable-wrapper=all + make +} + +package() { + cd musl-$pkgver + make DESTDIR="$pkgdir" install + + # configure syslibdir with /lib for PT_INTERP compat, but install to /usr/lib + mv "$pkgdir"/lib/ld-musl*.so* "$pkgdir$_sysroot"/lib/ + rmdir "$pkgdir"/lib + + pushd "$pkgdir"/usr/bin + local _bin + for _bin in *; do + mv "$_bin" "${_target%-gnu}-$_bin" + done + popd + + install -Dm0644 README "$pkgdir"/usr/share/doc/$pkgname/README + install -Dm0644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT +} -- To view, visit https://review.coreboot.org/c/flashrom/+/69781 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I28f524a53897685ab763c48f8be5370b8f6488b6 Gerrit-Change-Number: 69781 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashrom_tester: Fix unit test error
by Peter Marheine (Code Review) 18 Nov '22

18 Nov '22

Attention is currently required from: Edward O'Callaghan, Evan Benn. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69765 ) Change subject: flashrom_tester: Fix unit test error ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/69765 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iba42a9026b41ddb61bb704aa1c26783cd251d787 Gerrit-Change-Number: 69765 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Fri, 18 Nov 2022 02:17:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: test_build.sh: Add build_rust
by Evan Benn (Code Review) 18 Nov '22

18 Nov '22

Attention is currently required from: Felix Singer, Patrick Georgi. Evan Benn has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69770 ) Change subject: test_build.sh: Add build_rust ...................................................................... Patch Set 1: (1 comment) File test_build.sh: https://review.coreboot.org/c/flashrom/+/69770/comment/8b4a4b60_888485b7 PS1, Line 94: hash cargo && build_rust when jenkins has cargo I would make this `if hash cargo ; then build_rust ; else echo "skipping build_rust"; fi` -- To view, visit https://review.coreboot.org/c/flashrom/+/69770 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I728f5b856a9161b87b96207f4c3965e7493c33d1 Gerrit-Change-Number: 69770 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Comment-Date: Fri, 18 Nov 2022 01:45:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: test_build.sh: Add build_rust
by Evan Benn (Code Review) 18 Nov '22

18 Nov '22

Attention is currently required from: Felix Singer, Patrick Georgi, Evan Benn. Evan Benn has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69770 ) Change subject: test_build.sh: Add build_rust ...................................................................... Patch Set 1: (2 comments) File test_build.sh: https://review.coreboot.org/c/flashrom/+/69770/comment/4d595893_4eaee444 PS1, Line 71: PKG_CONFIG_PATH="${install_dir}/lib/x86_64-linux-gnu/pkgconfig" not sure if we can derive this path or if this is good enough https://review.coreboot.org/c/flashrom/+/69770/comment/c26c29b3_1ae4394e PS1, Line 87: do_for_rust test --offline this is not great as a user that has cargo but hasnt run this before needs to manually run the same commands without --offline. Not sure how I can do better, maybe the cargo commands will work without --offline on jenkins anyway? -- To view, visit https://review.coreboot.org/c/flashrom/+/69770 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I728f5b856a9161b87b96207f4c3965e7493c33d1 Gerrit-Change-Number: 69770 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Fri, 18 Nov 2022 01:39:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: test_build.sh: Add build_rust
by Evan Benn (Code Review) 18 Nov '22

18 Nov '22

Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69770 ) Change subject: test_build.sh: Add build_rust ...................................................................... test_build.sh: Add build_rust Add a function to check the rust projects. cargo test, fmt, and clippy are run to check unit tests, code format, and lint. The rust packages are built against the just compiled 'all' variant of libflashrom. cargo is run offline so that jenkins works. The tests are only run if cargo is installed. BUG=b:242935799 BRANCH=None TEST=./test_build.sh Change-Id: I728f5b856a9161b87b96207f4c3965e7493c33d1 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M test_build.sh 1 file changed, 44 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/69770/1 diff --git a/test_build.sh b/test_build.sh index 69d3a34..31a0199 100755 --- a/test_build.sh +++ b/test_build.sh @@ -53,6 +53,7 @@ for programmer in ${meson_programmer_opts}; do programmer_dir="${build_dir}/${programmer}" + install_dir="${PWD}/${programmer_dir}/install" # In case of clang analyzer we don't want to run it on # each programmer individually. Thus, just return here. @@ -60,12 +61,34 @@ return fi - meson ${programmer_dir} ${meson_opts} -Dprogrammer=${programmer} + meson ${programmer_dir} ${meson_opts} -Dprogrammer=${programmer} --prefix=${install_dir} ninja ${ninja_opts} -C ${programmer_dir} ninja ${ninja_opts} -C ${programmer_dir} test + + if [ "${programmer}" = "all" ]; then + # build_rust requires an installed header and library to link against. + ninja ${ninja_opts} -C ${programmer_dir} install + PKG_CONFIG_PATH="${install_dir}/lib/x86_64-linux-gnu/pkgconfig" + LD_LIBRARY_PATH="${install_dir}/lib/x86_64-linux-gnu" + fi done } +build_rust () ( + # Run in a subshell so the exports do not affect other functions + export PKG_CONFIG_PATH + export LD_LIBRARY_PATH + do_for_rust () { + git ls-files | grep Cargo.toml \ + | xargs -r -L1 sh -xc "cargo $* --manifest-path \$0" + } + # A manual initial run without --offline is required if the dependencies are + # not already installed + do_for_rust test --offline + do_for_rust fmt --check + do_for_rust clippy --offline --examples --tests --no-deps +) build_make build_meson +hash cargo && build_rust -- To view, visit https://review.coreboot.org/c/flashrom/+/69770 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I728f5b856a9161b87b96207f4c3965e7493c33d1 Gerrit-Change-Number: 69770 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashchips.c: Add 4BA write to XM25Qx256C
by Liam Flaherty (Code Review) 18 Nov '22

18 Nov '22

Attention is currently required from: Felix Singer, Angel Pons. Liam Flaherty has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69713 ) Change subject: flashchips.c: Add 4BA write to XM25Qx256C ...................................................................... Patch Set 3: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/69713/comment/0038e93c_307f9f3d PS2, Line 10: command (0x12) according to their datasheets, but the feature flag is not enabled in flashchips.c, so enable it to allow this feature to be used. > Wrap at 72 chars Done https://review.coreboot.org/c/flashrom/+/69713/comment/3e1d52c5_d2df714e PS2, Line 11: > Tested? I don't have access to these chips, so I have left the `tested` field as `TEST_UNTESTED`. This change is based on what the datasheet claims. -- To view, visit https://review.coreboot.org/c/flashrom/+/69713 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I96c80762fcda2af6028c7a53d8c545b0c6565cbd Gerrit-Change-Number: 69713 Gerrit-PatchSet: 3 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 18 Nov 2022 00:21:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: flashchips.c: Add 4BA write to XM25Qx256C
by Liam Flaherty (Code Review) 18 Nov '22

18 Nov '22

Attention is currently required from: Angel Pons, Liam Flaherty. Hello Felix Singer, build bot (Jenkins), Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/69713 to look at the new patch set (#3). Change subject: flashchips.c: Add 4BA write to XM25Qx256C ...................................................................... flashchips.c: Add 4BA write to XM25Qx256C Flash chips XM25QH256C and XM25QU256C support the 4-byte program command (0x12) according to their datasheets, but the feature flag is not enabled in flashchips.c, so enable it to allow this feature to be used. TICKET: https://ticket.coreboot.org/issues/371 BUG=b:259493706 TEST=build Change-Id: I96c80762fcda2af6028c7a53d8c545b0c6565cbd Signed-off-by: Liam Flaherty <liamflaherty(a)chromium.org> --- M flashchips.c 1 file changed, 23 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/69713/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/69713 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I96c80762fcda2af6028c7a53d8c545b0c6565cbd Gerrit-Change-Number: 69713 Gerrit-PatchSet: 3 Gerrit-Owner: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Liam Flaherty <liamflaherty(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: flashrom_tester: Fix unit test error
by Evan Benn (Code Review) 18 Nov '22

18 Nov '22

Evan Benn has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/69765 ) Change subject: flashrom_tester: Fix unit test error ...................................................................... flashrom_tester: Fix unit test error 065366d changed the time format, breaking the unit test. This patch fixes the unit test. BUG=None BRANCH=None TEST=cargo test Change-Id: Iba42a9026b41ddb61bb704aa1c26783cd251d787 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> --- M util/flashrom_tester/src/logger.rs 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/65/69765/1 diff --git a/util/flashrom_tester/src/logger.rs b/util/flashrom_tester/src/logger.rs index fb26bde..b700c19 100644 --- a/util/flashrom_tester/src/logger.rs +++ b/util/flashrom_tester/src/logger.rs @@ -153,9 +153,10 @@ assert_eq!(&buf[..5], "\x1b[35m"); // Time is difficult to test, assume it's formatted okay + // Split on the UTC timezone char assert_eq!( - &buf[24..], - " \x1b[33m[ INFO ]\x1b[0m Test message at INFO\n" + buf.split_once("Z ").unwrap().1, + "\x1b[33m[ INFO ]\x1b[0m Test message at INFO\n" ); } -- To view, visit https://review.coreboot.org/c/flashrom/+/69765 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iba42a9026b41ddb61bb704aa1c26783cd251d787 Gerrit-Change-Number: 69765 Gerrit-PatchSet: 1 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit November 2022