ZTS: Reverse constrained path lookup order
FreeBSD base system zfs utils are in /sbin. ZoF utils install to /usr/local/sbin. Ensure we link to the ZoF utils not the base utils when searching for utils to constrain paths to for the tests. Reviewed-by: John Kennedy <john.kennedy@delphix.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #9906
This commit is contained in:
parent
0ecd910923
commit
74b4d349b3
scripts
|
@ -239,8 +239,11 @@ create_links() {
|
||||||
constrain_path() {
|
constrain_path() {
|
||||||
. "$STF_SUITE/include/commands.cfg"
|
. "$STF_SUITE/include/commands.cfg"
|
||||||
|
|
||||||
SYSTEM_DIRS="/bin /sbin /usr/bin /usr/sbin"
|
# On FreeBSD, base system zfs utils are in /sbin and OpenZFS utils
|
||||||
SYSTEM_DIRS+=" /usr/local/bin /usr/local/sbin"
|
# 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+=" /usr/bin /usr/sbin /bin /sbin"
|
||||||
|
|
||||||
if [ "$INTREE" = "yes" ]; then
|
if [ "$INTREE" = "yes" ]; then
|
||||||
# Constrained path set to ./zfs/bin/
|
# Constrained path set to ./zfs/bin/
|
||||||
|
|
Loading…
Reference in New Issue