diff options
| author | legend-hua <[email protected]> | 2016-09-21 09:36:24 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-09-20 18:36:24 -0700 |
| commit | 9911a9c4c9501112dcb2a64a5195820068676e62 (patch) | |
| tree | eacbf71d123d8b3fe8636d77c8b9249fb7eec3d5 | |
| parent | 884385a0b25dc36b622e5e427bf29281c3dbca06 (diff) | |
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 <[email protected]>
Signed-off-by: legend-hua <[email protected]>
Closes #5133
| -rw-r--r-- | tests/zfs-tests/include/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/zfs-tests/include/default.cfg.in | 4 | ||||
| l--------- | tests/zfs-tests/include/zfs_commands.cfg | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/tests/zfs-tests/include/Makefile.am b/tests/zfs-tests/include/Makefile.am index d9e6f4712..a10d6a324 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 f6d6de0e9..a36ab3b1a 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 222b0389e..000000000 --- a/tests/zfs-tests/include/zfs_commands.cfg +++ /dev/null @@ -1 +0,0 @@ -../../../zfs-script-config.sh
\ No newline at end of file |