unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 2204dfb545d7e25b4093c4e47d44f35af86ba96e 1024 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
 
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

debug log:

solving 2204dfb545 ...
found 2204dfb545 in https://git.savannah.gnu.org/cgit/guix.git

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).