diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-21 10:20:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 10:20:58 +0000 |
| commit | f4524ddcc76593e46e981ad108c0e3011d1d7313 (patch) | |
| tree | 0721c46423ab436bc5785be4a049d233341672a5 | |
| parent | 5086ffd2e396a75235c019de4e5ff94a87f66ea9 (diff) | |
| parent | 6574665f9d6c0757e8f55ccb465afbcaa90bf019 (diff) | |
| download | genimage-f4524ddcc76593e46e981ad108c0e3011d1d7313.tar.gz genimage-f4524ddcc76593e46e981ad108c0e3011d1d7313.tar.xz | |
Merge pull request #113 from jetomit/fix-tests
Filesystem flags depend on the system – usually signed_directory_hash,
but unsigned_directory_hash at least on arm64.
| -rwxr-xr-x | test/basic-images.test | 2 |
1 files changed, 2 insertions, 0 deletions
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 |