aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2019-10-24 13:47:47 -0400
committerBrian Behlendorf <[email protected]>2019-10-24 10:47:47 -0700
commit4c6225b6888d5ea8f812d2f39eb9c2f7d40fb9e7 (patch)
treecf2bd5f8784aedae632449f0cf3f1d0c84996aa5
parent10fa254539ec41c6b043785d4e7ab34bce383b9f (diff)
ZTS: Consistency pass for .ksh extensions
* Use .ksh extension for ksh scripts, not .sh * Remove .ksh extension from tests in common.run Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #9502
-rw-r--r--tests/runfiles/common.run6
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh (renamed from tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh)0
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run
index a704c0ae7..629f0908a 100644
--- a/tests/runfiles/common.run
+++ b/tests/runfiles/common.run
@@ -254,8 +254,8 @@ tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg',
tags = ['functional', 'cli_root', 'zfs_snapshot']
[tests/functional/cli_root/zfs_sysfs]
-tests = ['zfeature_set_unsupported.ksh', 'zfs_get_unsupported',
- 'zfs_set_unsupported', 'zfs_sysfs_live.ksh', 'zpool_get_unsupported',
+tests = ['zfeature_set_unsupported', 'zfs_get_unsupported',
+ 'zfs_set_unsupported', 'zfs_sysfs_live', 'zpool_get_unsupported',
'zpool_set_unsupported']
tags = ['functional', 'cli_root', 'zfs_sysfs']
@@ -617,7 +617,7 @@ tests = ['filesystem_count', 'filesystem_limit', 'snapshot_count',
tags = ['functional', 'limits']
[tests/functional/link_count]
-tests = ['link_count_001', 'link_count_root_inode.ksh']
+tests = ['link_count_001', 'link_count_root_inode']
tags = ['functional', 'link_count']
[tests/functional/migration]
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
index c208a1c37..8a137b830 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/Makefile.am
@@ -19,7 +19,7 @@ dist_pkgdata_SCRIPTS = \
zfs_mount_all_mountpoints.ksh \
zfs_mount_encrypted.ksh \
zfs_mount_remount.ksh \
- zfs_mount_test_race.sh \
+ zfs_mount_test_race.ksh \
zfs_multi_mount.ksh
dist_pkgdata_DATA = \
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh
index 404770b27..404770b27 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh