From: Christian Göttsche <cgzones@xxxxxxxxxxxxxx> OverlayFS does not support a couple of ioctl's and other features, like NFS, so skip and tweak relevant tests. Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx> --- tests/capable_sys/test | 2 +- tests/ioctl/test_ioctl.c | 4 ++-- tests/ioctl/test_noioctl.c | 4 ++-- tests/overlay/test | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/capable_sys/test b/tests/capable_sys/test index 132c732..6fb57a1 100755 --- a/tests/capable_sys/test +++ b/tests/capable_sys/test @@ -10,7 +10,7 @@ BEGIN { $basedir =~ s|(.*)/[^/]*|$1|; $fs = `stat -f --print %T $basedir`; - $test_fibmap = ( $fs ne "btrfs" and $fs ne "nfs" ); + $test_fibmap = ( $fs ne "btrfs" and $fs ne "nfs" and $fs ne "overlayfs" ); $test_count = 7; if ($test_fibmap) { diff --git a/tests/ioctl/test_ioctl.c b/tests/ioctl/test_ioctl.c index 9bf732d..3ed0695 100644 --- a/tests/ioctl/test_ioctl.c +++ b/tests/ioctl/test_ioctl.c @@ -28,9 +28,9 @@ int main(int argc, char **argv) } /* This one should hit the FILE__GETATTR or FILE__IOCTL test */ - rc = ioctl(fd, FIGETBSZ, &val); + rc = ioctl(fd, FS_IOC_GETFLAGS, &val); if( rc < 0 ) { - perror("test_ioctl:FIGETBSZ"); + perror("test_ioctl:FS_IOC_GETFLAGS"); exit(1); } diff --git a/tests/ioctl/test_noioctl.c b/tests/ioctl/test_noioctl.c index b72a476..522fef5 100644 --- a/tests/ioctl/test_noioctl.c +++ b/tests/ioctl/test_noioctl.c @@ -44,9 +44,9 @@ int main(int argc, char **argv) } /* This one should hit the FILE__IOCTL or FILE__GETATTR test and fail. */ - rc = ioctl(fd, FIGETBSZ, &val); + rc = ioctl(fd, FS_IOC_GETFLAGS, &val); if( rc == 0 ) { - printf("test_noioctl:FIGETBSZ"); + printf("test_noioctl:FS_IOC_GETFLAGS"); exit(1); } diff --git a/tests/overlay/test b/tests/overlay/test index c8367dd..744fc9c 100755 --- a/tests/overlay/test +++ b/tests/overlay/test @@ -9,14 +9,15 @@ BEGIN { chop($seuser); $seuser =~ s|^(\w+):.*$|$1|; - $isnfs = `stat -f --print %T $basedir`; + $fs = `stat -f --print %T $basedir`; # check if kernel supports overlayfs and SELinux labeling if ( system("grep -q security_inode_copy_up /proc/kallsyms") ) { plan skip_all => "overlayfs not supported with SELinux in this kernel"; } - elsif ( $isnfs eq "nfs" ) { - plan skip_all => "overlayfs upperdir not supported on NFS"; + elsif ( $fs eq "nfs" or $fs eq "overlayfs" ) { + plan skip_all => + "overlayfs upperdir not supported on NFS and OverlayFS"; } else { plan tests => 119; -- 2.45.2