d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove script zfs_commands.cfg

Browse Source 
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 <behlendorf1@llnl.gov>
Signed-off-by: legend-hua <liu.hua130@zte.com.cn>
Closes #5133
This commit is contained in:
legend-hua 2016-09-21 09:36:24 +08:00 committed by Brian Behlendorf
parent 884385a0b2
commit 9911a9c4c9
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/zfs-tests/include/Makefile.am
View File

@ -5,6 +5,3 @@ dist_pkgdata_SCRIPTS = \
libtest.shlib \
math.shlib \
properties.shlib
EXTRA_DIST = \
zfs_commands.cfg

4
tests/zfs-tests/include/default.cfg.in
View File

@ -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

1
tests/zfs-tests/include/zfs_commands.cfg
View File

@ -1 +0,0 @@
../../../zfs-script-config.sh