From 4c6225b6888d5ea8f812d2f39eb9c2f7d40fb9e7 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 24 Oct 2019 13:47:47 -0400 Subject: [PATCH] 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 Signed-off-by: Ryan Moeller Closes #9502 --- tests/runfiles/common.run | 6 +++--- .../tests/functional/cli_root/zfs_mount/Makefile.am | 2 +- .../{zfs_mount_test_race.sh => zfs_mount_test_race.ksh} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename tests/zfs-tests/tests/functional/cli_root/zfs_mount/{zfs_mount_test_race.sh => zfs_mount_test_race.ksh} (100%) diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index a704c0ae7a6d..629f0908a24d 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 c208a1c378dc..8a137b8303c0 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 similarity index 100% rename from tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.sh rename to tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_test_race.ksh