Merge ~fginther/+git/overlay-shiftfs-tests:fginther/shiftfs-hung-error-out into ~canonical-kernel-team/+git/overlay-shiftfs-tests:main

[Francis Ginther]

tests/shiftfs-hung.sh: Exit on errors

The shiftfs-hung.sh test was not set to exit on errors. This caused an
incorrect pass on kernels which did not have shiftfs available.

Signed-off-by: Francis Ginther <email address hidden>

The shiftfs-hung.sh test does not fail as it should on kernels without the shiftfs module. With the `-e`, this test will silently pass. After this update, it will now output an error message and return an error code:

$ ./shiftfs-hung.sh
mount: /tmp/d2: unknown filesystem type 'shiftfs'.
$ echo $?
32

[Po-Hsu Lin (cypressyew)]

LGTM.
Thanks!

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/tests/shiftfs-hung.sh b/tests/shiftfs-hung.sh
index fb41e15..8581a8e 100755
--- a/tests/shiftfs-hung.sh
+++ b/tests/shiftfs-hung.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # CVE-2023-2612
 # Trigger potential hung task timeout with shiftfs (locking unbalance)
@@ -8,7 +8,7 @@
 # Check that this kernel supports shiftfs before running test
 check_shiftfs_compatible
 
-unshare -U -r -i -m /bin/bash 2>/dev/null << EOF
+unshare -U -r -i -m /bin/bash -e << EOF
 cd /tmp/
 mkdir d1 d2
 mount -t mqueue none d1