diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2016-02-25 12:00:13 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2016-02-25 12:05:49 +0200 |
| commit | 046a48ba34bd0534b913eaed5016d65e3ea6e190 (patch) | |
| tree | 8593b459cbce2ed0ce23d3be8481cf78cec38199 | |
| parent | c5ec5ffb1bda95c4c46ce0fa7c8ed64ae38cdc54 (diff) | |
test-kvm: fixes
1. We need curl -L for the new S3 redirect
2. Parsing dmesg may not work as systemd might flood the buffer.
Test that kvm dev exists, which is udev will only create if kvm
is properly started
3. Update to latest UEFI
Change-Id: Ie36b391a41dcd9deca1effa90aa94d2a1198e73e
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rwxr-xr-x | common/scripts/kvm/test-kvm.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/scripts/kvm/test-kvm.sh b/common/scripts/kvm/test-kvm.sh index d704438..f68376e 100755 --- a/common/scripts/kvm/test-kvm.sh +++ b/common/scripts/kvm/test-kvm.sh @@ -135,7 +135,7 @@ fi ARCH=`uname -m` -dmesg|grep 'Hyp mode initialized successfully' && echo "$KVM_INIT 0 pc pass" || \ +[ -c /dev/kvm ] && echo "$KVM_INIT 0 pc pass" || \ { echo "$KVM_INIT 0 pc fail" echo "$KVM_HOST_NET 0 pc skip" @@ -147,7 +147,7 @@ dmesg|grep 'Hyp mode initialized successfully' && echo "$KVM_INIT 0 pc pass" || curl 2>/dev/null if [ $? = 2 ]; then EXTRACT_BUILD_NUMBER="curl -sk" - DOWNLOAD_FILE="curl -SOk" + DOWNLOAD_FILE="curl -SOkL -# " else EXTRACT_BUILD_NUMBER="wget -q --no-check-certificate -O -" DOWNLOAD_FILE="wget --no-clobber --progress=dot -e dotbytes=2M --no-check-certificate" @@ -172,7 +172,7 @@ case ${ARCH} in $DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm-guest/$BUILD_NUMBER_GUEST/arm64/kvm-arm64.qcow2.xz $DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$hwpack/$BUILD_NUMBER_HOST/Image-${hwpack} $DOWNLOAD_FILE http://snapshots.linaro.org/ubuntu/images/kvm/$hwpack/$BUILD_NUMBER_HOST/nbd-${hwpack}.ko.gz - $DOWNLOAD_FILE http://releases.linaro.org/15.01/components/kernel/uefi-linaro/release/qemu64-intelbds/QEMU_EFI.fd + $DOWNLOAD_FILE http://releases.linaro.org/components/kernel/uefi-linaro/15.12/release/qemu64/QEMU_EFI.fd xz -d kvm-arm64.qcow2.xz zcat nbd-${hwpack}.ko.gz > nbd.ko insmod nbd.ko max_part=16 |