diff options
| author | Pavel Snajdr <[email protected]> | 2020-11-28 20:15:57 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-28 11:15:57 -0800 |
| commit | 52c8537513652a9d424009cde03299e83a8c4467 (patch) | |
| tree | cf181db98a2d4e2b8c1e8668cdc7f12e2f6cc859 /scripts/zfs-tests.sh | |
| parent | b2a54a28b5ebad7165bbf10bd4de8066a6bf335d (diff) | |
zpool_influxdb: move to libexec dir
Move the zpool_influxdb command to /usr/libexec/zfs,
and include the /usr/libexec/zfs path in the system search
directory when running the test suite.
Reviewed-by: Richard Elling <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Pavel Snajdr <[email protected]>
Closes #11156
Closes #11160
Closes #11224
Diffstat (limited to 'scripts/zfs-tests.sh')
| -rwxr-xr-x | scripts/zfs-tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh index ea6dc7eb2..f986edf76 100755 --- a/scripts/zfs-tests.sh +++ b/scripts/zfs-tests.sh @@ -242,7 +242,7 @@ constrain_path() { # install to /usr/local/sbin. To avoid testing the wrong utils we # need /usr/local to come before / in the path search order. SYSTEM_DIRS="/usr/local/bin /usr/local/sbin" - SYSTEM_DIRS="$SYSTEM_DIRS /usr/bin /usr/sbin /bin /sbin" + SYSTEM_DIRS="$SYSTEM_DIRS /usr/bin /usr/sbin /bin /sbin $LIBEXEC_DIR" if [ "$INTREE" = "yes" ]; then # Constrained path set to ./zfs/bin/ |