aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2019-06-19 10:39:28 -0700
committerGitHub <[email protected]>2019-06-19 10:39:28 -0700
commit4ca457b065c6d95d9b6b2ed776f14e7e33257b94 (patch)
tree23b74afb3c689bb997b3561f94eea58508ca15da /tests
parent30af21b02569ac192f52ce6e6511015f8a8d5729 (diff)
ZTS: Fix mmp_interval failure
The mmp_interval test case was failing on Fedora 30 due to the built-in 'echo' command terminating the script when it was unable to write to the sysfs module parameter. This change in behavior was observed with ksh-2020.0.0-alpha1. Resolve the issue by using the external cat command which fails gracefully as expected. Additionally, remove some incorrect quotes around the $? return values. Reviewed-by: Giuseppe Di Natale <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Olaf Faaland <[email protected]> Reviewed-by: Richard Elling <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #8906
Diffstat (limited to 'tests')
-rw-r--r--tests/zfs-tests/include/libtest.shlib8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index 9c3c20fd9..7078eb30b 100644
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -3495,13 +3495,13 @@ function set_tunable_impl
Linux)
typeset zfs_tunables="/sys/module/$module/parameters"
[[ -w "$zfs_tunables/$tunable" ]] || return 1
- echo -n "$value" > "$zfs_tunables/$tunable"
- return "$?"
+ cat >"$zfs_tunables/$tunable" <<<"$value"
+ return $?
;;
SunOS)
[[ "$module" -eq "zfs" ]] || return 1
echo "${tunable}/${mdb_cmd}0t${value}" | mdb -kw
- return "$?"
+ return $?
;;
esac
}
@@ -3528,7 +3528,7 @@ function get_tunable_impl
typeset zfs_tunables="/sys/module/$module/parameters"
[[ -f "$zfs_tunables/$tunable" ]] || return 1
cat $zfs_tunables/$tunable
- return "$?"
+ return $?
;;
SunOS)
[[ "$module" -eq "zfs" ]] || return 1