From: Miklos Szeredi Date: Mon, 16 Apr 2018 10:41:41 +0000 (+0200) Subject: overlay/013: do not expect failure X-Git-Tag: v2022.05.01~1599 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=792514c38480f4617ee0b677d8076b60a41be71b overlay/013: do not expect failure Current test expects test_lower to fail with: truncate(test_lower) should have failed While it is sort of okay to fail like that (the above expectation basically acknowledges this weirdness in the overlayfs implementation), it is by no means the only correct behavior: it is also correct for the test to succeed (i.e. truncation fails with ETXTBSY). So add an option to t_truncate_self.c that allows both success and failure, but obviously not SIGSEGV, which is what a we'd get in a real failure mode. Signed-off-by: Miklos Szeredi Reviewed-by: Amir Goldstein Signed-off-by: Eryu Guan --- diff --git a/src/t_truncate_self.c b/src/t_truncate_self.c index 3f1c8e6f..a11f7d5a 100644 --- a/src/t_truncate_self.c +++ b/src/t_truncate_self.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -10,6 +11,8 @@ int main(int argc, char *argv[]) ret = truncate(argv[0], 4096); if (ret != -1) { + if (argc == 2 && strcmp(argv[1], "--may-succeed") == 0) + return 0; fprintf(stderr, "truncate(%s) should have failed\n", progname); return 1; diff --git a/tests/overlay/013 b/tests/overlay/013 index de0fc26a..8ff438d8 100755 --- a/tests/overlay/013 +++ b/tests/overlay/013 @@ -65,9 +65,10 @@ _scratch_mount # run test program from lower and upper dir # test programs truncate themselfs, all should fail with ETXTBSY -$SCRATCH_MNT/test_lower +$SCRATCH_MNT/test_lower --may-succeed $SCRATCH_MNT/test_upper # success, all done +echo "Silence is golden" status=0 exit diff --git a/tests/overlay/013.out b/tests/overlay/013.out index b2c7cc7e..3e66423b 100644 --- a/tests/overlay/013.out +++ b/tests/overlay/013.out @@ -1,2 +1,2 @@ QA output created by 013 -truncate(test_lower) should have failed +Silence is golden