extra-tests: Don't use $QEMU as a variable.

Since 'QEMU' is set (overwritten) by the autoconf-generated Makefile,
this test would always test installed qemu, not upstream qemu,
making it pretty useless.  Use another name for this variable.

2 files changed, 13 insertions, 6 deletions

diff --git a/tests/extra/test-upstream-qemu-wrapper.sh b/tests/extra/test-upstream-qemu-wrapper.sh
index ab9787e1..bec2bc0b 100755
--- a/tests/extra/test-upstream-qemu-wrapper.sh
+++ b/tests/extra/test-upstream-qemu-wrapper.sh
@@ -15,4 +15,4 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-exec "$QEMU" -L "$QEMUDIR/pc-bios" "$@"
+exec "$upstream_qemu" -L "$QEMUDIR/pc-bios" "$@"
diff --git a/tests/extra/test-upstream-qemu.sh b/tests/extra/test-upstream-qemu.sh
index d8f16f4b..70e0c034 100755
--- a/tests/extra/test-upstream-qemu.sh
+++ b/tests/extra/test-upstream-qemu.sh
@@ -23,17 +23,24 @@ if [ ! -d "$QEMUDIR" ]; then
     exit 77
 fi
 
-QEMU="$QEMUDIR/x86_64-softmmu/qemu-system-x86_64"
-if ! "$QEMU" --help >/dev/null 2>&1; then
-    echo "$0: $QEMU not executable, tests against upstream qemu skipped"
+# Note that Makefile sets 'QEMU', so we cannot use that variable.
+upstream_qemu="$QEMUDIR/x86_64-softmmu/qemu-system-x86_64"
+if ! "$upstream_qemu" --help >/dev/null 2>&1; then
+    echo "$0: $upstream_qemu not executable, tests against upstream qemu skipped"
     exit 77
 fi
 
-"$QEMU" --version
+"$upstream_qemu" --version
 
 LIBGUESTFS_QEMU=$abs_srcdir/test-upstream-qemu-wrapper.sh
+
+if [ ! -f "$LIBGUESTFS_QEMU" ]; then
+    echo "$0: internal error: \$LIBGUESTFS_QEMU not a file"
+    exit 1
+fi
+
 export LIBGUESTFS_QEMU
-export QEMU
+export upstream_qemu
 
 $MAKE -C ../.. quickcheck
 $MAKE -C ../c-api check