From f5f438194df6419573eb699f9ef0c8b0e1aeaf12 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Fri, 21 Feb 2020 11:52:44 -0500 Subject: [PATCH] ZTS: Move privilege tests to sunos.run These tests are unspported on FreeBSD and Linux for lack of pfexec. Move the privilege tests to sunos.run and remove the platform checks. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10035 --- tests/runfiles/common.run | 4 ---- tests/runfiles/sunos.run | 4 ++++ tests/zfs-tests/tests/functional/privilege/setup.ksh | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index cbd8ef93ef6b..84709b3240b3 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -668,10 +668,6 @@ tags = ['functional', 'pool_names'] tests = ['poolversion_001_pos', 'poolversion_002_pos'] tags = ['functional', 'poolversion'] -[tests/functional/privilege] -tests = ['privilege_001_pos', 'privilege_002_pos'] -tags = ['functional', 'privilege'] - [tests/functional/pyzfs] tests = ['pyzfs_unittest'] pre = diff --git a/tests/runfiles/sunos.run b/tests/runfiles/sunos.run index 129e1c57034b..0cff4046e4f6 100644 --- a/tests/runfiles/sunos.run +++ b/tests/runfiles/sunos.run @@ -33,6 +33,10 @@ tags = ['functional', 'cli_root', 'zpool_add'] tests = ['zpool_create_016_pos'] tags = ['functional', 'cli_root', 'zpool_create'] +[tests/functional/privilege] +tests = ['privilege_001_pos', 'privilege_002_pos'] +tags = ['functional', 'privilege'] + [tests/functional/xattr:illumos] tests = ['xattr_008_pos', 'xattr_009_neg', 'xattr_010_neg'] tags = ['functional', 'xattr'] diff --git a/tests/zfs-tests/tests/functional/privilege/setup.ksh b/tests/zfs-tests/tests/functional/privilege/setup.ksh index 5ee593a7cb25..4eb069394475 100755 --- a/tests/zfs-tests/tests/functional/privilege/setup.ksh +++ b/tests/zfs-tests/tests/functional/privilege/setup.ksh @@ -31,10 +31,6 @@ . $STF_SUITE/include/libtest.shlib -if is_linux || is_freebsd; then - log_unsupported "Requires pfexec command" -fi - ZFS_USER=zfsrbac USES_NIS=false