From 09e535b238d9cf0b79dd622c639295b4492f09fc Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 20 Mar 2017 10:48:46 +0100 Subject: [PATCH] netperf: replace FORCE_QEMU by check for autopilot Now, the script prevents the execution of the test if its started by the autopilot on Qemu but permits manual runs without taking further precautions. --- repos/ports/run/netperf.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index b8e325dad0..fac722a6f5 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -4,15 +4,12 @@ # \date 2013-04-18 # -# setting environment variable FORCE_QEMU permits running netperf in qemu -set force_qemu [info exists ::env(FORCE_QEMU)] - proc gpio_drv { } { if {[have_spec rpi] && [have_spec hw]} { return hw_gpio_drv } if {[have_spec rpi] && [have_spec foc]} { return foc_gpio_drv } return gpio_drv } -if {[expr [have_include "power_on/qemu"] && !$force_qemu]} { - puts "\nNetperf running on Qemu is not recommended.\n" +if {[get_cmd_switch --autopilot] && [have_include "power_on/qemu"]} { + puts "\nRunning netperf in autopilot on Qemu is not recommended.\n" exit } @@ -302,7 +299,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 " +append qemu_args " -m 128 -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 "