From c48d819d8dbf46620919acb60e95fdf18e1e516d Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Fri, 14 Feb 2025 21:34:39 +1100 Subject: [PATCH] ZTS: runfiles: remove explicit outputdir The config file value overrides any set by the operator, making it quite difficult to put the test output elsewhere. The default is /var/tmp/test_results (via BASEDIR in test-runner) so this shouldn't change anything for the default case. Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris Reviewed-by: Tony Hutter Reviewed-by: Tino Reichardt Reviewed-by: Igor Kozhukhov --- scripts/zfs-tests.sh | 1 - tests/runfiles/bclone.run | 1 - tests/runfiles/common.run | 1 - tests/runfiles/freebsd.run | 1 - tests/runfiles/linux.run | 1 - tests/runfiles/longevity.run | 1 - tests/runfiles/perf-regression.run | 1 - tests/runfiles/sanity.run | 1 - tests/runfiles/sunos.run | 1 - 9 files changed, 9 deletions(-) diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh index e158b5eb0..ae62f8f2a 100755 --- a/scripts/zfs-tests.sh +++ b/scripts/zfs-tests.sh @@ -505,7 +505,6 @@ user = $SINGLETESTUSER timeout = 600 post_user = root post = -outputdir = /var/tmp/test_results EOF if [ "$SINGLETEST" = "${SINGLETEST%/*}" ] ; then NEWSINGLETEST=$(find "$STF_SUITE" -name "$SINGLETEST*" -print -quit) diff --git a/tests/runfiles/bclone.run b/tests/runfiles/bclone.run index 3d0f545d9..f4b7a69e2 100644 --- a/tests/runfiles/bclone.run +++ b/tests/runfiles/bclone.run @@ -25,7 +25,6 @@ post_user = root post = cleanup failsafe_user = root failsafe = callbacks/zfs_failsafe -outputdir = /var/tmp/test_results tags = ['bclone'] [tests/functional/bclone] diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index ee1f29595..a4ca670de 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -25,7 +25,6 @@ post_user = root post = cleanup failsafe_user = root failsafe = callbacks/zfs_failsafe -outputdir = /var/tmp/test_results tags = ['functional'] [tests/functional/acl/off] diff --git a/tests/runfiles/freebsd.run b/tests/runfiles/freebsd.run index 943c8eab2..1b8f7f336 100644 --- a/tests/runfiles/freebsd.run +++ b/tests/runfiles/freebsd.run @@ -19,7 +19,6 @@ post_user = root post = cleanup failsafe_user = root failsafe = callbacks/zfs_failsafe -outputdir = /var/tmp/test_results tags = ['functional'] [tests/functional/cli_root/zfs_jail:FreeBSD] diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 275772f28..19474af52 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -19,7 +19,6 @@ post_user = root post = cleanup failsafe_user = root failsafe = callbacks/zfs_failsafe -outputdir = /var/tmp/test_results tags = ['functional'] [tests/functional/acl/posix:Linux] diff --git a/tests/runfiles/longevity.run b/tests/runfiles/longevity.run index fde2ef6ab..85f5809d2 100644 --- a/tests/runfiles/longevity.run +++ b/tests/runfiles/longevity.run @@ -17,7 +17,6 @@ quiet = False user = root timeout = 10800 -outputdir = /var/tmp/test_results [/opt/zfs-tests/tests/longevity] tests = ['slop_space_test'] diff --git a/tests/runfiles/perf-regression.run b/tests/runfiles/perf-regression.run index ec081040d..c5ba3924e 100644 --- a/tests/runfiles/perf-regression.run +++ b/tests/runfiles/perf-regression.run @@ -21,7 +21,6 @@ user = root timeout = 0 post_user = root post = cleanup -outputdir = /var/tmp/test_results tags = ['perf'] [tests/perf/regression] diff --git a/tests/runfiles/sanity.run b/tests/runfiles/sanity.run index d6a791e33..2ab32674f 100644 --- a/tests/runfiles/sanity.run +++ b/tests/runfiles/sanity.run @@ -27,7 +27,6 @@ post_user = root post = cleanup failsafe_user = root failsafe = callbacks/zfs_failsafe -outputdir = /var/tmp/test_results tags = ['functional'] [tests/functional/acl/off] diff --git a/tests/runfiles/sunos.run b/tests/runfiles/sunos.run index 9ba00f452..1f2c787d5 100644 --- a/tests/runfiles/sunos.run +++ b/tests/runfiles/sunos.run @@ -19,7 +19,6 @@ post_user = root post = cleanup failsafe_user = root failsafe = callbacks/zfs_failsafe -outputdir = /var/tmp/test_results tags = ['functional'] [tests/functional/inuse:illumos]