commit 6574665f9d6c0757e8f55ccb465afbcaa90bf019
Author: Timotej Lazar <timotej.lazar@araneo.si>
Date:   Wed Aug 19 19:36:02 2020 +0200

    test: normalize flags reported by dumpe2fs
    
    Filesystem flags depend on the system – usually signed_directory_hash,
    but unsigned_directory_hash at least on arm64.
    
    Signed-off-by: Timotej Lazar <timotej.lazar@araneo.si>

diff --git a/test/basic-images.test b/test/basic-images.test
index f6685e1..cb104c3 100755
--- a/test/basic-images.test
+++ b/test/basic-images.test
@@ -158,6 +158,8 @@ check_ext() {
 	# format change
 	csum2="Group 0: (Blocks 1-4095) \\[ITABLE_ZEROED\\]\|  Checksum .*, unused inodes 205"
 	dumpe2fs "${1}" | grep -v "^\($uuid\|$seed\|$csum1\|$csum2\)" > "dump" &&
+	# some architectures (including arm64) use unsigned char
+	sed -i 's/un\(signed_directory_hash\)/\1/' "dump" &&
 	# fixup for ext3 journal size with old tune2fs
 	sed -i 's/^\(Journal size:             \)1029k$/\11024k/' "dump" &&
 	# output format changed with some version
ef='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>refs</a><a class='active' href='/guix/log/tests/system.scm'>log</a><a href='/guix/tree/tests/system.scm?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>tree</a><a href='/guix/commit/tests/system.scm?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>commit</a><a href='/guix/diff/tests/system.scm?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/system.scm'>
<input type='hidden' name='id' value='df3664f1ec9a8b3c59c0e61f197798c2dda986e3'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>root</a>/<a href='/guix/log/tests?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>tests</a>/<a href='/guix/log/tests/system.scm?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3'>system.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/system.scm?id=df3664f1ec9a8b3c59c0e61f197798c2dda986e3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-06-21 23:54:15 +0200'>2018-06-21</span></td><td><a href='/guix/commit/tests/system.scm?id=68a58775e071d4b0e000b93ad121b6e64d161b79'>system: Mapped devices needed for boot do not yield Shepherd services.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-05-28 13:24:19 +0200'>2018-05-28</span></td><td><a href='/guix/commit/tests/system.scm?id=9ceeca0880248eee8c2796f5e6ebc172b95277f7'>system: Remove uses of the 'title' field of &lt;file-system&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-12-06 15:02:24 +0100'>2017-12-06</span></td><td><a href='/guix/commit/tests/system.scm?id=fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35'>gnu, doc, tests: Use ‘bootloader-configuration’ everywhere.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-08-23 22:23:19 +0200'>2017-08-23</span></td><td><a href='/guix/commit/tests/system.scm?id=045ebb3e58d74c75f39ce47380045d3cd00359c3'>gnu: bootloader: Deprecate "device" field in favor of "target".</a><span class='msg-avail'>...</span></td><td>Andy Wingo</td></tr>
<tr><td><span title='2016-08-31 15:44:20 +0200'>2016-08-31</span></td><td><a href='/guix/commit/tests/system.scm?id=7b44cae50aed1d6d67337e9eae9f449ccd00a870'>services: shepherd: Add 'shepherd-service-upgrade', from 'guix system'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-08-31 15:44:20 +0200'>2016-08-31</span></td><td><a href='/guix/commit/tests/system.scm?id=d4f8884fdb897e648fd7f4262b2142d8c363ac76'>guix system: Do not unload services depended on.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-08-31 15:44:20 +0200'>2016-08-31</span></td><td><a href='/guix/commit/tests/system.scm?id=f20a7b869668b46a011d22e4c1dcb68f855a1c62'>guix system: Use 'shepherd-service-lookup-procedure' in 'service-upgrade'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-08-31 15:44:20 +0200'>2016-08-31</span></td><td><a href='/guix/commit/tests/system.scm?id=b8692e4696d0d2b36466827da1e0d25d69a298af'>guix system: Extract and test the service upgrade procedure.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-07-18 01:26:03 +0200'>2016-07-18</span></td><td><a href='/guix/commit/tests/system.scm?id=2bdd7ac17ceff60cd5ef77e530f62cea902bf90d'>system: Honor the 'dependencies' field of file systems.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-04-03 14:19:09 +0200'>2016-04-03</span></td><td><a href='/guix/commit/tests/system.scm?id=a9edb211e733b8b34e67ec3b4450567e9376986f'>build: Add a Guile custom test driver using SRFI-64.</a><span class='msg-avail'>...</span></td><td>Mathieu Lirzin</td></tr>
<tr><td><span title='2016-01-22 00:02:52 +0100'>2016-01-22</span></td><td><a href='/guix/commit/tests/system.scm?id=6b779207ee627c93fc0dad18ef67c149024fa535'>system: grub: Search root device by label or UUID if possible.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>