From af1cbe34c85d9a6c9f4669ecd6fa91aaa1366c27 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Tue, 26 Jun 2018 14:33:31 +1000 Subject: test/qemu: start building qemu again, and use our built qemu for tests We need to use QEMU_BIN rather than QEMU as the makefiles define QEMU already. Signed-off-by: Stewart Smith --- opal-ci/build-ubuntu-16.04.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'opal-ci') diff --git a/opal-ci/build-ubuntu-16.04.sh b/opal-ci/build-ubuntu-16.04.sh index 989b748..053e7e2 100755 --- a/opal-ci/build-ubuntu-16.04.sh +++ b/opal-ci/build-ubuntu-16.04.sh @@ -9,7 +9,8 @@ MAKE_J=`grep -c processor /proc/cpuinfo` export CROSS="ccache powerpc64le-linux-gnu-" make -j${MAKE_J} all -#(cd opal-ci; ./build-qemu-powernv.sh) +(cd opal-ci; ./build-qemu-powernv.sh) +export QEMU_BIN=`pwd`/opal-ci/qemu/ppc64-softmmu/qemu-system-ppc64 ./opal-ci/fetch-debian-jessie-installer.sh make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) -- cgit v1.1