[Git][reproducible-builds/diffoscope][master] 2 commits: tests: cbfs: add Comp column to support coreboot utils > 4.6

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
29da4e40 by Marc Herbert at 2019-09-04T22:22:16Z
tests: cbfs: add Comp column to support coreboot utils > 4.6

The compression column was added in October 2017 / v4.7 by
https://review.coreboot.org/c/coreboot/+/22196/ (0c2f0c1d31)

Signed-off-by: Marc Herbert <Marc.Herbert at gmail.com>

- - - - -
4f2a87df by Mattia Rizzolo at 2019-09-05T06:26:43Z
Merge branch 'update-cbfs-test' of salsa.debian.org:marc-guest/diffoscope

MR: https://salsa.debian.org/reproducible-builds/diffoscope/merge_requests/31
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- tests/comparators/test_cbfs.py
- + tests/data/cbfs_listing_comp_column_expected.diff


Changes:

=====================================
tests/comparators/test_cbfs.py
=====================================
@@ -124,10 +124,12 @@ def differences(rom1, rom2):
 def test_listing(differences):
     # Newer versions of cbfstool do not create the "legacy" header by default
     # and thus is missing from the diff.
+    # Even newer versions added a "compression" column.
 
     assert differences[0].unified_diff in (
         get_data('cbfs_listing_expected_diff'),
         get_data('cbfs_listing_no_legacy_header_expected_diff'),
+        get_data('cbfs_listing_comp_column_expected.diff'),  # cbfs >= 4.6
     )
 
 


=====================================
tests/data/cbfs_listing_comp_column_expected.diff
=====================================
@@ -0,0 +1,6 @@
+@@ -1,3 +1,3 @@
+ Name                           Offset     Type           Size   Comp
+-text                           0x0        raw               446 none
+-(empty)                        0x200      null            32152 none
++text                           0x0        raw               671 none
++(empty)                        0x300      null            31896 none



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/cae019e8273bf83cc6d6540d89ca989106f8a32c...4f2a87dfa1cfe94e9d1f7f37a36b8ea8b6467e2f

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/cae019e8273bf83cc6d6540d89ca989106f8a32c...4f2a87dfa1cfe94e9d1f7f37a36b8ea8b6467e2f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190905/656553f4/attachment.html>