Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/56439 )
Change subject: tests: Trim excessive new lines from layout test output ......................................................................
tests: Trim excessive new lines from layout test output
This patch is making layout test output more compact, spanning less vertical lines while logging the same information.
No changes made to the test functionality.
BUG=b:193584590 TEST=ninja test
Change-Id: I36a39505f8db508672cde5a848684a3a22f5ccc4 Signed-off-by: Anastasia Klimchuk aklm@chromium.org Reviewed-on: https://review.coreboot.org/c/flashrom/+/56439 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Angel Pons th3fanbus@gmail.com --- M tests/layout.c 1 file changed, 18 insertions(+), 18 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
diff --git a/tests/layout.c b/tests/layout.c index e3e9539..5f0aee5 100644 --- a/tests/layout.c +++ b/tests/layout.c @@ -23,26 +23,26 @@ { (void) state; /* unused */
- printf("Creating layout...\n"); + printf("Creating layout... "); struct flashrom_layout *layout; assert_int_equal(0, flashrom_layout_new(&layout)); printf("done\n");
- printf("Adding and including first region...\n"); + printf("Adding and including first region... "); assert_int_equal(0, flashrom_layout_add_region(layout, 0x00021000, 0x00031000, "first region")); assert_int_equal(0, flashrom_layout_include_region(layout, "first region")); - printf("done\n"); + printf("done");
- printf("Adding and including second (non-overlapping) region...\n"); + printf(", second (non-overlapping) region... "); assert_int_equal(0, flashrom_layout_add_region(layout, 0x00031001, 0x0023efc0, "second region")); assert_int_equal(0, flashrom_layout_include_region(layout, "second region")); printf("done\n");
- printf("Asserting included regions do not overlap...\n"); + printf("Asserting included regions do not overlap... "); assert_int_equal(0, included_regions_overlap(layout)); printf("done\n");
- printf("Releasing layout...\n"); + printf("Releasing layout... "); flashrom_layout_release(layout); printf("done\n"); } @@ -51,26 +51,26 @@ { (void) state; /* unused */
- printf("Creating layout...\n"); + printf("Creating layout... "); struct flashrom_layout *layout; assert_int_equal(0, flashrom_layout_new(&layout)); printf("done\n");
- printf("Adding and including first region...\n"); + printf("Adding and including first region... "); assert_int_equal(0, flashrom_layout_add_region(layout, 0x00021000, 0x00031000, "first region")); assert_int_equal(0, flashrom_layout_include_region(layout, "first region")); - printf("done\n"); + printf("done");
- printf("Adding and including second (overlapping) region...\n"); + printf(", second (overlapping) region... "); assert_int_equal(0, flashrom_layout_add_region(layout, 0x00027100, 0x0023efc0, "second region")); assert_int_equal(0, flashrom_layout_include_region(layout, "second region")); printf("done\n");
- printf("Asserting included regions overlap...\n"); + printf("Asserting included regions overlap... "); assert_int_equal(1, included_regions_overlap(layout)); printf("done\n");
- printf("Releasing layout...\n"); + printf("Releasing layout... "); flashrom_layout_release(layout); printf("done\n"); } @@ -79,25 +79,25 @@ { (void) state; /* unused */
- printf("Creating layout...\n"); + printf("Creating layout... "); struct flashrom_layout *layout; assert_int_equal(0, flashrom_layout_new(&layout)); printf("done\n");
- printf("Adding and including first region...\n"); + printf("Adding and including first region... "); assert_int_equal(0, flashrom_layout_add_region(layout, 0x00021000, 0x00031000, "first region")); assert_int_equal(0, flashrom_layout_include_region(layout, "first region")); - printf("done\n"); + printf("done");
- printf("Adding second (overlapping) region, not included...\n"); + printf(", second (overlapping) region, not included... "); assert_int_equal(0, flashrom_layout_add_region(layout, 0x00027100, 0x0023efc0, "second region")); printf("done\n");
- printf("Asserting included regions do not overlap...\n"); + printf("Asserting included regions do not overlap... "); assert_int_equal(0, included_regions_overlap(layout)); printf("done\n");
- printf("Releasing layout...\n"); + printf("Releasing layout... "); flashrom_layout_release(layout); printf("done\n"); }