From 28f7427ab163887e901708dec5e7e72a6ac2a269 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 24 Oct 2019 13:49:19 -0400 Subject: [PATCH] ZTS: Move tmpfile tests to linux.run O_TMPFILE is not available on FreeBSD. Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #9503 --- tests/runfiles/common.run | 4 ---- tests/runfiles/linux.run | 4 ++++ tests/zfs-tests/tests/functional/Makefile.am | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index 629f0908a24d..423ce815890b 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -836,10 +836,6 @@ tags = ['functional', 'suid'] tests = ['threadsappend_001_pos'] tags = ['functional', 'threadsappend'] -[tests/functional/tmpfile] -tests = ['tmpfile_001_pos', 'tmpfile_002_pos', 'tmpfile_003_pos'] -tags = ['functional', 'tmpfile'] - [tests/functional/trim] tests = ['autotrim_integrity', 'autotrim_config', 'autotrim_trim_integrity', 'trim_integrity', 'trim_config'] diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 13b874055076..2ccf3b2ae10e 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -101,6 +101,10 @@ tags = ['functional', 'rsend'] tests = ['snapshot_015_pos', 'snapshot_016_pos'] tags = ['functional', 'snapshot'] +[tests/functional/tmpfile:Linux] +tests = ['tmpfile_001_pos', 'tmpfile_002_pos', 'tmpfile_003_pos'] +tags = ['functional', 'tmpfile'] + [tests/functional/upgrade:Linux] tests = ['upgrade_projectquota_001_pos'] tags = ['functional', 'upgrade'] diff --git a/tests/zfs-tests/tests/functional/Makefile.am b/tests/zfs-tests/tests/functional/Makefile.am index 6c9cb3e04929..c8706c407fa0 100644 --- a/tests/zfs-tests/tests/functional/Makefile.am +++ b/tests/zfs-tests/tests/functional/Makefile.am @@ -70,7 +70,6 @@ SUBDIRS = \ sparse \ suid \ threadsappend \ - tmpfile \ trim \ truncate \ upgrade \ @@ -80,3 +79,8 @@ SUBDIRS = \ write_dirs \ xattr \ zvol + +if BUILD_LINUX +SUBDIRS += \ + tmpfile +endif