diff options
| author | Jinshan Xiong <[email protected]> | 2016-04-06 09:48:10 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-04-12 10:50:01 -0700 |
| commit | e61237961448ab1fedf7975715fac753ccc7acef (patch) | |
| tree | f1177dfb65b6da52c5bfeaf846578cb14c4a3069 /tests/zfs-tests | |
| parent | 2b54cb14517b8b3877716dbe02fe75f12a47eb5e (diff) | |
Make zfs test easier to run in local install
When ZFS is installed by 'make install', programs will be installed
into '/usr/local'. ZFS test scripts can't locate programs 'zpool'
that caused tests failure.
Fix typo in help message.
Add sanity check to for ksh and generate a useful error message.
Signed-off-by: Jinshan Xiong <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4495
Diffstat (limited to 'tests/zfs-tests')
| -rw-r--r-- | tests/zfs-tests/include/default.cfg.in | 29 | ||||
| -rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 7 |
2 files changed, 15 insertions, 21 deletions
diff --git a/tests/zfs-tests/include/default.cfg.in b/tests/zfs-tests/include/default.cfg.in index 2711c7074..2fd9a9830 100644 --- a/tests/zfs-tests/include/default.cfg.in +++ b/tests/zfs-tests/include/default.cfg.in @@ -29,6 +29,20 @@ # . $STF_SUITE/include/commands.cfg + +# Common paths +bindir=@bindir@ +sbindir=@sbindir@ + +# ZFS Commands +export ZDB=${ZDB:-${sbindir}/zdb} +export ZFS=${ZFS:-${sbindir}/zfs} +export ZHACK=${ZHACK:-${sbindir}/zhack} +export ZINJECT=${ZINJECT:-${sbindir}/zinject} +export ZPOOL=${ZPOOL:-${sbindir}/zpool} +export ZTEST=${ZTEST:-${sbindir}/ztest} +export ZPIOS=${ZPIOS:-${sbindir}/zpios} + . $STF_SUITE/include/libtest.shlib # Optionally override the installed ZFS commands to run in-tree @@ -45,21 +59,8 @@ export RT_SHORT="1" export ZONE_POOL="zonepool" export ZONE_CTR="zonectr" -# Common paths -bindir=@bindir@ -sbindir=@sbindir@ -helperdir=@datarootdir@/@PACKAGE@/zfs-tests/bin - -# ZFS Commands -ZDB=${ZDB:-${sbindir}/zdb} -ZFS=${ZFS:-${sbindir}/zfs} -ZHACK=${ZHACK:-${sbindir}/zhack} -ZINJECT=${ZINJECT:-${sbindir}/zinject} -ZPOOL=${ZPOOL:-${sbindir}/zpool} -ZTEST=${ZTEST:-${sbindir}/ztest} -ZPIOS=${ZPIOS:-${sbindir}/zpios} - # Test Suite Specific Commands +helperdir=@datarootdir@/@PACKAGE@/zfs-tests/bin export CHG_USR_EXEC=${CHG_USR_EXEC:-${helperdir}/chg_usr_exec} export DEVNAME2DEVID=${DEVNAME2DEVID:-${helperdir}/devname2devid} export DIR_RD_UPDATE=${DIR_RD_UPDATE:-${helperdir}/dir_rd_update} diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 10ef5a99f..1ac3d0641 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -31,13 +31,6 @@ . ${STF_TOOLS}/include/logapi.shlib -ZDB=${ZDB:-/sbin/zdb} -ZFS=${ZFS:-/sbin/zfs} -ZINJECT=${ZINJECT:-/sbin/zinject} -ZHACK=${ZHACK:-/sbin/zhack} -ZPOOL=${ZPOOL:-/sbin/zpool} -ZTEST=${ZTEST:-/sbin/ztest} - # Determine if this is a Linux test system # # Return 0 if platform Linux, 1 if otherwise |