From dccf45f376a11ae175267e4f68924ce713b639d8 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 17 Jan 2012 12:09:51 -0700 Subject: [PATCH] tests: avoid dirname in tests qemuxml2argvtest sanitizes PATH to just /bin, but on at least Fedora 16, dirname lives in /usr/bin instead. Regression introduced in commit e7201afd. * tests/qemuxml2argvdata/qemu.sh: Avoid forking a dirname call, since dirname might not be in PATH after test sanitization. * tests/qemuxml2argvdata/qemu-supported-cpus.sh: Likewise. Diagnosed by Michal Privoznik. --- tests/qemuxml2argvdata/qemu-supported-cpus.sh | 2 +- tests/qemuxml2argvdata/qemu.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/qemu-supported-cpus.sh b/tests/qemuxml2argvdata/qemu-supported-cpus.sh index ed3ae94423..0204f51988 100755 --- a/tests/qemuxml2argvdata/qemu-supported-cpus.sh +++ b/tests/qemuxml2argvdata/qemu-supported-cpus.sh @@ -1,6 +1,6 @@ #! /bin/sh -. $(dirname $0)/qemu-lib.sh +. ${0%/*}/qemu-lib.sh case $* in "-M ?") diff --git a/tests/qemuxml2argvdata/qemu.sh b/tests/qemuxml2argvdata/qemu.sh index 38da0b3521..5928c1b145 100755 --- a/tests/qemuxml2argvdata/qemu.sh +++ b/tests/qemuxml2argvdata/qemu.sh @@ -1,6 +1,6 @@ #! /bin/sh -. $(dirname $0)/qemu-lib.sh +. ${0%/*}/qemu-lib.sh case $* in "-M ?") -- 2.47.2