Fix Several Test Failures
PATCH v5 3/3 tests: Support Changed mkfs.ext2 Behavior for -r Flag
In reply to Andrew HamiltonCorrect nuisance ext234_test failure on newer Linux distros.
Recently, the mkfs.ext2 utility removed support for the -r flag to specify old (version 0) formats of ext2. A new flag was added to allow the same behavior. Support both ways of specifying version 0 ext2 file systems when testing ext2 in GRUB.
--- tests/util/grub-fs-tester.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tests/util/grub-fs-tester.in +5 -1
@@ -880,7 +880,11 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do xnilfs2) "mkfs.nilfs2" -L "$FSLABEL" -b $BLKSIZE -q "${MOUNTDEVICE}" ;; xext2_old) - MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext2" -r 0 -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" + if "mkfs.ext2" -r 0 2>&1 | grep -F "the -r option has been removed"; then + MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext2" -E revision=0 -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" + else + MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.ext2" -r 0 -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" + fi MOUNTFS=ext2 ;; xext4_metabg)
Signature · 7 lines
2.43.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
v5 cover Fix Several Test Failures
Correct several test failures observed while running GRUB 'make check' on Debian 13. The test failures fixed here are:
1. ZFS ZSTD - Test was failing zfs_test due to lack of support in zfs-fuse for zstd compression. This specific test case was split into a new test file allowing skipping if zstd is
not supported to avoid masking other possible (future) zfs test failures.
2. Correct test failure in erofs_test in newer Linux distros caused by a change in mkfs.erofs to limit the maximum file system label length to 15 characters. Reduce the label used for testing to work within this limit.
3. Correct test failure in ext234_test in newer Linux distros caused by a change in e2fsprogs that removed the ability to set "version 0" ext2 file systems using the "-r" flag. Instead a new flag is added to support this. Update the test to support the old method in older distros and the new method in newer distros.
Changes since v4:
- Change return code from 99 to 77 in zstd test
Changes since v3:
- Rebase changes against current master branch.
Changes since v2:
- Change return code from 77 to 99 in zstd test
Changes since v1:
- Remove unrelated changes to .gitignore
Andrew Hamilton (3):
tests: Split ZFS ZSTD Test Into New File
tests: Avoid Test Failure in erofs for label length
tests: Support Changed mkfs.ext2 Behavior for -r Flag
.gitignore | 1 + Makefile.util.def | 6 ++++++ tests/util/grub-fs-tester.in | 13 ++++++++++--- tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 tests/zfs_zstd_test.in
Signature · 7 lines
2.43.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v5 2/3 tests: Avoid Test Failure in erofs for label length
Recently, mkfs.erofs began to enforce that the file system label is 15 characters or less (exluding NULL terminator). This causes the current erofs test in GRUB to fail. Reduce the test label used to fit in this limit allowing the test to work as expected.
--- tests/util/grub-fs-tester.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tests/util/grub-fs-tester.in +5 -2
@@ -386,9 +386,12 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do FSLABEL="g;/_é䏌䐓䏕䎛䎾䏴кит u" #FSLABEL="g;/_é莭莽😁кит u" ;; - # FS LIMITATION: reiserfs, extN, jfs and erofs label is at most 16 UTF-8 characters - x"reiserfs_old" | x"reiserfs" | x"ext"* | x"lvm"* | x"luks"* | x"mdraid"* | x"jfs" | x"jfs_caseins" | x"erofs_"*) + # FS LIMITATION: reiserfs, extN, and jfs label is at most 16 UTF-8 characters + x"reiserfs_old" | x"reiserfs" | x"ext"* | x"lvm"* | x"luks"* | x"mdraid"* | x"jfs" | x"jfs_caseins") FSLABEL="g;/éт 莭😁";; + # FS LIMITATION: erofs label is at most 15 UTF-8 characters + x"erofs_"*) + FSLABEL="g;/é 莭😁";; # FS LIMITATION: No underscore, space, semicolon, slash or international characters in UFS* in label. Limited to 32 UTF-8 characters x"ufs1" | x"ufs1_sun" | x"ufs2") FSLABEL="grubtest""ieurrucnenreeiurueurewf";;
Signature · 7 lines
2.43.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v5 1/3 tests: Split ZFS ZSTD Test Into New File
In reply to Andrew HamiltonSplit ZFS ZSTD test into its own test script. Add a check to the new test script to see if the zfs utility installed on the host supports "zstd" compression before running the test and skip the test if not. It seems at least some zfs-fuse binaries do not support zstd compression and the current test will fail in that case. Splitting into a new file will avoid masking other test failures due to missing zstd support.
--- .gitignore | 1 + Makefile.util.def | 6 ++++++ tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/zfs_zstd_test.in
.gitignore +1 -0
@@ -283,3 +283,4 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test +/zfs_zstd_test
Makefile.util.def +6 -0
@@ -914,6 +914,12 @@ script = { common = tests/zfs_test.in; }; +script = { + testcase = native; + name = zfs_zstd_test; + common = tests/zfs_zstd_test.in; +}; + script = { testcase = native; name = cpio_test;
tests/zfs_test.in +0 -1
@@ -19,7 +19,6 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle -"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidz
tests/zfs_zstd_test.in new file +30 -0
@@ -0,0 +1,30 @@ +#!@BUILD_SHEBANG@ + +set -e + +if [ "x$EUID" = "x" ] ; then + EUID=`id -u` +fi + +if [ "$EUID" != 0 ] ; then + exit 99 +fi + +if ! which zpool >/dev/null 2>&1; then + echo "zpool not installed; cannot test zfs." + exit 77 +fi + +if ! which zfs >/dev/null 2>&1; then + echo "zfs not installed; cannot test zfs." + exit 77 +fi + +# If OpenZFS is not installed (only zfs-fuse for example) then +# skip ZSTD compression testing. +if ! zfs get 2>&1 | grep -F "compression" | grep -F "zstd"; then + echo "zfs zstd compression not supported; cannot test zfs zstd." + exit 77 +fi + +"@builddir@/grub-fs-tester" zfs_zstd
Signature · 7 lines
2.43.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v5 1/3] tests: Split ZFS ZSTD Test Into New File
Quoted 76 lines · On Thu, 6 Nov 2025 21:41:37 -0600 Andrew Hamilton <[email protected]> wrote:
Split ZFS ZSTD test into its own test script. Add a check to the new test script to see if the zfs utility installed on the host supports "zstd" compression before running the test and skip the test if not. It seems at least some zfs-fuse binaries do not support zstd compression and the current test will fail in that case. Splitting into a new file will avoid masking other test failures due to missing zstd support.
Signed-off-by Andrew Hamilton <[email protected]>Reviewed-by Daniel Kiper <[email protected]>--- .gitignore | 1 + Makefile.util.def | 6 ++++++ tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/zfs_zstd_test.in.gitignore +1
-0@@ -283,3 +283,4 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test +/zfs_zstd_testMakefile.util.def +6
-0@@ -914,6 +914,12 @@ script = { common = tests/zfs_test.in; }; +script = { + testcase = native; + name = zfs_zstd_test; + common = tests/zfs_zstd_test.in; +}; + script = { testcase = native; name = cpio_test;tests/zfs_test.in +0
-1@@ -19,7 +19,6 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle -"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidztests/zfs_zstd_test.in new file +14
-0@@ -0,0 +1,30 @@ +#!@BUILD_SHEBANG@ + +set -e + +if [ "x$EUID" = "x" ] ; then + EUID=`id -u` +fi + +if [ "$EUID" != 0 ] ; then + exit 99 +fi + +if ! which zpool >/dev/null 2>&1; then + echo "zpool not installed; cannot test zfs."
tests/zfs_zstd_test.in line 24
Quoted 10 lines
tests/zfs_zstd_test.in new file +10
-0+ exit 77 +fi + +if ! which zfs >/dev/null 2>&1; then + echo "zfs not installed; cannot test zfs." + exit 77 +fi + +# If OpenZFS is not installed (only zfs-fuse for example) then +# skip ZSTD compression testing.
This is kind of misleading as a comment. Its really, "If the ZFS implementation does not support ZSTD compression, for example zfs-fuse, then fail early." OpenZFS just happens to be the only ZFS implementation that currently supports ZSTD compression. And this might not even be true, do Solaris implementations support ZSTD? A quick search suggests yes. Now running tests is only officially on Debian (as of now), but I don't think this comment needs to take that as an assumption.
tests/zfs_zstd_test.in line 27
Quoted 3 lines
tests/zfs_zstd_test.in new file +3
-0+if ! zfs get 2>&1 | grep -F "compression" | grep -F "zstd"; then + echo "zfs zstd compression not supported; cannot test zfs zstd." + exit 77
These should be reverted to return 99. I explained in a reply to the v4 patch. Apologize for not catching this sooner.
Glenn
tests/zfs_zstd_test.in line 30
Quoted 3 lines
tests/zfs_zstd_test.in new file +3
-0+fi + +"@builddir@/grub-fs-tester" zfs_zstd
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v5 1/3] tests: Split ZFS ZSTD Test Into New File
Quoted 88 lines · Glenn Washburn
Quoted 76 lines · On Thu, 6 Nov 2025 21:41:37 -0600 Andrew Hamilton <[email protected]> wrote:
Split ZFS ZSTD test into its own test script. Add a check to the new test script to see if the zfs utility installed on the host supports "zstd" compression before running the test and skip the test if not. It seems at least some zfs-fuse binaries do not support zstd compression and the current test will fail in that case. Splitting into a new file will avoid masking other test failures due to missing zstd support.
Signed-off-by Andrew Hamilton <[email protected]>Reviewed-by Daniel Kiper <[email protected]>--- .gitignore | 1 + Makefile.util.def | 6 ++++++ tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/zfs_zstd_test.in.gitignore +1
-0@@ -283,3 +283,4 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test +/zfs_zstd_testMakefile.util.def +6
-0@@ -914,6 +914,12 @@ script = { common = tests/zfs_test.in; }; +script = { + testcase = native; + name = zfs_zstd_test; + common = tests/zfs_zstd_test.in; +}; + script = { testcase = native; name = cpio_test;tests/zfs_test.in +0
-1@@ -19,7 +19,6 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle -"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidztests/zfs_zstd_test.in new file +14
-0@@ -0,0 +1,30 @@ +#!@BUILD_SHEBANG@ + +set -e + +if [ "x$EUID" = "x" ] ; then + EUID=`id -u` +fi + +if [ "$EUID" != 0 ] ; then + exit 99 +fi + +if ! which zpool >/dev/null 2>&1; then + echo "zpool not installed; cannot test zfs."tests/zfs_zstd_test.in line 24
Quoted 10 lines
tests/zfs_zstd_test.in new file +10
-0+ exit 77 +fi + +if ! which zfs >/dev/null 2>&1; then + echo "zfs not installed; cannot test zfs." + exit 77 +fi + +# If OpenZFS is not installed (only zfs-fuse for example) then +# skip ZSTD compression testing.
Quoted 8 lines
This is kind of misleading as a comment. Its really, "If the ZFS implementation does not support ZSTD compression, for example zfs-fuse, then fail early." OpenZFS just happens to be the only ZFS implementation that currently supports ZSTD compression. And this might not even be true, do Solaris implementations support ZSTD? A quick search suggests yes. Now running tests is only officially on Debian (as of now), but I don't think this comment needs to take that as an assumption.
Andrew, could you fix this?
Quoted 6 lines
tests/zfs_zstd_test.in line 27
Quoted 3 lines
tests/zfs_zstd_test.in new file +3
-0+if ! zfs get 2>&1 | grep -F "compression" | grep -F "zstd"; then + echo "zfs zstd compression not supported; cannot test zfs zstd." + exit 77These should be reverted to return 99. I explained in a reply to the v4 patch. Apologize for not catching this sooner.
Glenn, OK, so, AIUI you are OK with earlier two 77's but this one should be reverted to 99. Right?
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v5 1/3] tests: Split ZFS ZSTD Test Into New File
Yes I’ll fix the comment and change the return code(s) depending on Glenn’s response to your clarification question.
Thanks,
Andrew
Quoted 105 lines · Daniel Kiper
Quoted 1 line · Glenn Washburn
On Thu, 6 Nov 2025 21:41:37 -0600 Andrew Hamilton <[email protected]>
Quoted 87 lines · wrote:
Quoted 76 lines
Split ZFS ZSTD test into its own test script. Add a check to the new test script to see if the zfs utility installed on the host supports "zstd" compression before running the test and skip the test if not. It seems at least some zfs-fuse binaries do not support zstd compression and the current test will fail in that case. Splitting into a new file will avoid masking other test failures due to missing zstd support.
Signed-off-by Andrew Hamilton <[email protected]>Reviewed-by Daniel Kiper <[email protected]>--- .gitignore | 1 + Makefile.util.def | 6 ++++++ tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/zfs_zstd_test.in.gitignore +1
-0@@ -283,3 +283,4 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test +/zfs_zstd_testMakefile.util.def +6
-0@@ -914,6 +914,12 @@ script = { common = tests/zfs_test.in; }; +script = { + testcase = native; + name = zfs_zstd_test; + common = tests/zfs_zstd_test.in; +}; + script = { testcase = native; name = cpio_test;tests/zfs_test.in +0
-1@@ -19,7 +19,6 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle -"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidztests/zfs_zstd_test.in new file +14
-0@@ -0,0 +1,30 @@ +#!@BUILD_SHEBANG@ + +set -e + +if [ "x$EUID" = "x" ] ; then + EUID=`id -u` +fi + +if [ "$EUID" != 0 ] ; then + exit 99 +fi + +if ! which zpool >/dev/null 2>&1; then + echo "zpool not installed; cannot test zfs."tests/zfs_zstd_test.in line 24
Quoted 10 lines
tests/zfs_zstd_test.in new file +10
-0+ exit 77 +fi + +if ! which zfs >/dev/null 2>&1; then + echo "zfs not installed; cannot test zfs." + exit 77 +fi + +# If OpenZFS is not installed (only zfs-fuse for example) then +# skip ZSTD compression testing.Quoted 8 lines
This is kind of misleading as a comment. Its really, "If the ZFS implementation does not support ZSTD compression, for example zfs-fuse, then fail early." OpenZFS just happens to be the only ZFS implementation that currently supports ZSTD compression. And this might not even be true, do Solaris implementations support ZSTD? A quick search suggests yes. Now running tests is only officially on Debian (as of now), but I don't think this comment needs to take that as an assumption.
Andrew, could you fix this?
Quoted 4 lines
Quoted 3 lines
tests/zfs_zstd_test.in new file +3
-0+if ! zfs get 2>&1 | grep -F "compression" | grep -F "zstd"; then + echo "zfs zstd compression not supported; cannot test zfs zstd." + exit 77
Quoted 8 lines
Quoted 2 lines
These should be reverted to return 99. I explained in a reply to the v4 patch. Apologize for not catching this sooner.
Glenn, OK, so, AIUI you are OK with earlier two 77's but this one should be reverted to 99. Right?
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v5 1/3] tests: Split ZFS ZSTD Test Into New File
In reply to Daniel Kiper via Grub-develQuoted 104 lines · On Wed, 12 Nov 2025 20:52:39 +0100 Daniel Kiper <[email protected]> wrote:
Quoted 88 lines · Glenn Washburn
Quoted 76 lines · On Thu, 6 Nov 2025 21:41:37 -0600 Andrew Hamilton <[email protected]> wrote:
Split ZFS ZSTD test into its own test script. Add a check to the new test script to see if the zfs utility installed on the host supports "zstd" compression before running the test and skip the test if not. It seems at least some zfs-fuse binaries do not support zstd compression and the current test will fail in that case. Splitting into a new file will avoid masking other test failures due to missing zstd support.
Signed-off-by Andrew Hamilton <[email protected]>Reviewed-by Daniel Kiper <[email protected]>--- .gitignore | 1 + Makefile.util.def | 6 ++++++ tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/zfs_zstd_test.in.gitignore +1
-0@@ -283,3 +283,4 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test +/zfs_zstd_testMakefile.util.def +6
-0@@ -914,6 +914,12 @@ script = { common = tests/zfs_test.in; }; +script = { + testcase = native; + name = zfs_zstd_test; + common = tests/zfs_zstd_test.in; +}; + script = { testcase = native; name = cpio_test;tests/zfs_test.in +0
-1@@ -19,7 +19,6 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle -"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidztests/zfs_zstd_test.in new file +14
-0@@ -0,0 +1,30 @@ +#!@BUILD_SHEBANG@ + +set -e + +if [ "x$EUID" = "x" ] ; then + EUID=`id -u` +fi + +if [ "$EUID" != 0 ] ; then + exit 99 +fi + +if ! which zpool >/dev/null 2>&1; then + echo "zpool not installed; cannot test zfs."tests/zfs_zstd_test.in line 24
Quoted 10 lines
tests/zfs_zstd_test.in new file +10
-0+ exit 77 +fi + +if ! which zfs >/dev/null 2>&1; then + echo "zfs not installed; cannot test zfs." + exit 77 +fi + +# If OpenZFS is not installed (only zfs-fuse for example) then +# skip ZSTD compression testing.Quoted 8 lines
This is kind of misleading as a comment. Its really, "If the ZFS implementation does not support ZSTD compression, for example zfs-fuse, then fail early." OpenZFS just happens to be the only ZFS implementation that currently supports ZSTD compression. And this might not even be true, do Solaris implementations support ZSTD? A quick search suggests yes. Now running tests is only officially on Debian (as of now), but I don't think this comment needs to take that as an assumption.
Andrew, could you fix this?
Quoted 4 lines
Quoted 3 lines
tests/zfs_zstd_test.in new file +3
-0+if ! zfs get 2>&1 | grep -F "compression" | grep -F "zstd"; then + echo "zfs zstd compression not supported; cannot test zfs zstd." + exit 77
Quoted 5 lines
Quoted 2 lines
These should be reverted to return 99. I explained in a reply to the v4 patch. Apologize for not catching this sooner.
Glenn, OK, so, AIUI you are OK with earlier two 77's but this one should be reverted to 99. Right?
They really should all be 99, which means the test failed for a reason other than "GRUB has a bug that needs to be fixed". This typically is because of a misconfigured environment, which is what all the above tests check for. A 77 means, skip this test because it tests for something not relevant to this target.
Glenn
Quoted 2 lines
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v5 1/3] tests: Split ZFS ZSTD Test Into New File
Quoted 108 lines · Glenn Washburn
Quoted 107 lines · On Wed, 12 Nov 2025 20:52:39 +0100 > Daniel Kiper <[email protected]>…
Quoted 88 lines · Glenn Washburn
Quoted 76 lines · On Thu, 6 Nov 2025 21:41:37 -0600 Andrew Hamilton <[email protected]> wrote:
Split ZFS ZSTD test into its own test script. Add a check to the new test script to see if the zfs utility installed on the host supports "zstd" compression before running the test and skip the test if not. It seems at least some zfs-fuse binaries do not support zstd compression and the current test will fail in that case. Splitting into a new file will avoid masking other test failures due to missing zstd support.
Signed-off-by Andrew Hamilton <[email protected]>Reviewed-by Daniel Kiper <[email protected]>--- .gitignore | 1 + Makefile.util.def | 6 ++++++ tests/zfs_test.in | 1 - tests/zfs_zstd_test.in | 30 ++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/zfs_zstd_test.in.gitignore +1
-0@@ -283,3 +283,4 @@ widthspec.bin /xfs_test /xzcompress_test /zfs_test +/zfs_zstd_testMakefile.util.def +6
-0@@ -914,6 +914,12 @@ script = { common = tests/zfs_test.in; }; +script = { + testcase = native; + name = zfs_zstd_test; + common = tests/zfs_zstd_test.in; +}; + script = { testcase = native; name = cpio_test;tests/zfs_test.in +0
-1@@ -19,7 +19,6 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle -"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidztests/zfs_zstd_test.in new file +14
-0@@ -0,0 +1,30 @@ +#!@BUILD_SHEBANG@ + +set -e + +if [ "x$EUID" = "x" ] ; then + EUID=`id -u` +fi + +if [ "$EUID" != 0 ] ; then + exit 99 +fi + +if ! which zpool >/dev/null 2>&1; then + echo "zpool not installed; cannot test zfs."tests/zfs_zstd_test.in line 24
Quoted 10 lines
tests/zfs_zstd_test.in new file +10
-0+ exit 77 +fi + +if ! which zfs >/dev/null 2>&1; then + echo "zfs not installed; cannot test zfs." + exit 77 +fi + +# If OpenZFS is not installed (only zfs-fuse for example) then +# skip ZSTD compression testing.Quoted 8 lines
This is kind of misleading as a comment. Its really, "If the ZFS implementation does not support ZSTD compression, for example zfs-fuse, then fail early." OpenZFS just happens to be the only ZFS implementation that currently supports ZSTD compression. And this might not even be true, do Solaris implementations support ZSTD? A quick search suggests yes. Now running tests is only officially on Debian (as of now), but I don't think this comment needs to take that as an assumption.
Andrew, could you fix this?
Quoted 6 lines
tests/zfs_zstd_test.in line 27
Quoted 3 lines
tests/zfs_zstd_test.in new file +3
-0+if ! zfs get 2>&1 | grep -F "compression" | grep -F "zstd"; then + echo "zfs zstd compression not supported; cannot test zfs zstd." + exit 77These should be reverted to return 99. I explained in a reply to the v4 patch. Apologize for not catching this sooner.
Quoted 8 lines
Quoted 2 lines
Glenn, OK, so, AIUI you are OK with earlier two 77's but this one should be reverted to 99. Right?
They really should all be 99, which means the test failed for a reason other than "GRUB has a bug that needs to be fixed". This typically is because of a misconfigured environment, which is what all the above tests check for. A 77 means, skip this test because it tests for something not relevant to this target.
OK... May I ask you to document all these codes somewhere? docs/grub-dev.texi?
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel