diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-12-12 14:13:44 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-12-14 11:32:46 +0000 |
| commit | ddc2c5605ed003d46a3dba6e6adc1d7414319075 (patch) | |
| tree | d72e337c789c4cb2cfacd44094ed438f5bc1960a | |
| parent | 70e7ffd0d99c92b3f3b7a78517263382f97eb7a2 (diff) | |
tcwg_kernel-build.sh: Test booting using just-built QEMU
... instead of distro-provided version of QEMU.
Change-Id: I7d3d773b98c21813d07df84150a7028b8405a460
| -rwxr-xr-x | tcwg_kernel-build.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index ca789c1c..452b66ef 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -214,15 +214,8 @@ boot_linux () *) assert false ;; esac - local qemu="qemu-system-${rr[target]}" - - if ! which "$qemu" >/dev/null; then - # Install QEMU if it's not present. - # TODO: We should build QEMU from source as an additional component. - # Booting kernel with QEMU master/release would be a good test. - sudo apt update - sudo DEBIAN_FRONTEND=noninteractive apt install -y "$qemu" - fi + local qemu + qemu="$(pwd)/abe/builds/hosttools/x86_64-unknown-linux-gnu/bin/qemu-system-${rr[target]}" timeout --foreground 60s "$qemu" \ -kernel $image -machine virt $cpu -m 512 \ @@ -313,9 +306,9 @@ tcwg_kernel_breakup_updated_components () rr[breakup_updated_components]=tcwg_kernel_breakup_updated_components run_step stop_on_fail -10 reset_artifacts +run_step stop_on_fail x prepare_abe case "${rr[toolchain]}" in gnu) - run_step stop_on_fail x prepare_abe run_step skip_on_fail -9 build_abe binutils run_step skip_on_fail -1 build_abe stage1 ;; @@ -324,6 +317,7 @@ case "${rr[toolchain]}" in ;; esac run_step skip_on_fail x build_linux +run_step skip_on_fail x build_abe qemu run_step skip_on_fail x boot_linux run_step reset_on_fail x check_regression run_step stop_on_fail x update_baseline |