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 openzfs#5669 Closes openzfs#5743
wli5 · Feb 27, 2017 · d418d0b · d418d0b
1 parent 4ddeb71
commit d418d0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
 }