diff options
| author | LOLi <[email protected]> | 2017-02-06 19:08:10 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-06 10:08:10 -0800 |
| commit | 582cc0141699991da38ba8bfc8eb938ecb2d9856 (patch) | |
| tree | 13044c9256299d4f1fab08419274735ce979d605 /tests | |
| parent | 298ec40b6d9edcbde7b1fbbf172bd05be0eb9b97 (diff) | |
Fix ZFS Test Suite failures caused by ksh brace expansion feature
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #5669
Closes #5743
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runfiles/linux.run | 4 | ||||
| -rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 117117661..d9d5d58d6 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -118,10 +118,8 @@ tests = ['zfs_get_001_pos', 'zfs_get_002_pos', 'zfs_get_003_pos', 'zfs_get_005_neg', 'zfs_get_007_neg', 'zfs_get_008_pos', 'zfs_get_009_pos', 'zfs_get_010_neg'] -# DISABLED: -# zfs_inherit_003_pos - https://github.com/zfsonlinux/zfs/issues/5669 [tests/functional/cli_root/zfs_inherit] -tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg'] +tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg', 'zfs_inherit_003_pos'] # DISABLED: # zfs_mount_006_pos - https://github.com/zfsonlinux/zfs/issues/4990 diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index b5f8b1291..4127d35a8 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -1035,7 +1035,7 @@ function get_prop # property dataset return 1 fi - $ECHO $prop_val + $ECHO "$prop_val" return 0 } @@ -1062,7 +1062,7 @@ function get_pool_prop # property pool return 1 fi - $ECHO $prop_val + $ECHO "$prop_val" return 0 } |