From 9911a9c4c9501112dcb2a64a5195820068676e62 Mon Sep 17 00:00:00 2001 From: legend-hua Date: Wed, 21 Sep 2016 09:36:24 +0800 Subject: [PATCH] Remove script zfs_commands.cfg zfs_commands.cfg have printed "No such file or directory", When executing script/zfs-test.sh. The script is a symlink to ../../../zfs-script-config.sh So delete the symlink, and directly source $SRCDIR/zfs-script-config.sh when it exists from default.cfg.in Reviewed-off-by: Brian Behlendorf Signed-off-by: legend-hua Closes #5133 --- tests/zfs-tests/include/Makefile.am | 3 --- tests/zfs-tests/include/default.cfg.in | 4 ++-- tests/zfs-tests/include/zfs_commands.cfg | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 120000 tests/zfs-tests/include/zfs_commands.cfg diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am index d9e6f47125..a10d6a3240 100644 --- a/tests/zfs-tests/include/Makefile.am +++ b/tests/zfs-tests/include/Makefile.am @@ -5,6 +5,3 @@ dist_pkgdata_SCRIPTS = \ libtest.shlib \ math.shlib \ properties.shlib - -EXTRA_DIST = \ - zfs_commands.cfg diff --git a/tests/zfs-tests/include/default.cfg.in b/tests/zfs-tests/include/default.cfg.in index f6d6de0e9a..a36ab3b1a4 100644 --- a/tests/zfs-tests/include/default.cfg.in +++ b/tests/zfs-tests/include/default.cfg.in @@ -47,8 +47,8 @@ export RAIDZ_TEST=${RAIDZ_TEST:-${bindir}/raidz_test} . $STF_SUITE/include/libtest.shlib # Optionally override the installed ZFS commands to run in-tree -if [[ -f "$STF_SUITE/include/zfs_commands.cfg" ]]; then - . $STF_SUITE/include/zfs_commands.cfg +if [[ -f "$SRCDIR/zfs-script-config.sh" ]]; then + . $SRCDIR/zfs-script-config.sh fi # Define run length constants diff --git a/tests/zfs-tests/include/zfs_commands.cfg b/tests/zfs-tests/include/zfs_commands.cfg deleted file mode 120000 index 222b0389e9..0000000000 --- a/tests/zfs-tests/include/zfs_commands.cfg +++ /dev/null @@ -1 +0,0 @@ -../../../zfs-script-config.sh \ No newline at end of file