From 6f8cc92ce0b3c435f95fdd85d72fa9b6d7816e6e Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 14 Aug 2017 10:50:00 +0200 Subject: [PATCH] run: disable some scripts in autopilot mode because of the limit hardware features of our x86 32bit test hardware --- repos/dde_linux/run/usb_hid.run | 8 ++++---- repos/libports/run/smartcard.run | 8 ++++---- repos/ports/run/netperf_lwip_wifi.run | 5 +++++ repos/ports/run/netperf_lxip_wifi.run | 5 +++++ repos/ports/run/seoul-auto.run | 5 +++++ repos/ports/run/virtualbox_auto.inc | 5 +++++ 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 9f702ce244..70f5c3a867 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -38,8 +38,8 @@ # input events on the host PC. # -if { [have_spec linux] } { - puts "Run script does not support Linux." +if { [have_spec linux] || [have_spec muen] } { + puts "Run script does not support Linux and Muen." exit 0 } @@ -48,8 +48,8 @@ if { [get_cmd_switch --autopilot] && [have_include "power_on/qemu"] } { exit 0 } -if { [get_cmd_switch --autopilot] && ![have_spec x86] } { - puts "Run script is only supported in autopilot mode on x86 platforms" +if { [get_cmd_switch --autopilot] && ![have_spec x86_x64] } { + puts "Run script does not support autopilot mode on this platform" exit 0 } diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index a0875f0b5c..ab707c5150 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -5,13 +5,13 @@ # configured for the application and for the USB driver. # -if { [have_include "power_on/qemu"] || [have_spec linux] } { - puts "Run script does not support Qemu or Linux" +if { [have_include "power_on/qemu"] || [have_spec linux] || [have_spec muen] } { + puts "Run script does not support Qemu, Linux, and Muen" exit 0 } -if { [get_cmd_switch --autopilot] && ![have_spec x86] } { - puts "Run script is only supported in autopilot mode on x86 platforms" +if { [get_cmd_switch --autopilot] && ![have_spec x86_64] } { + puts "Run script does not support autopilot mode on this platform" exit 0 } diff --git a/repos/ports/run/netperf_lwip_wifi.run b/repos/ports/run/netperf_lwip_wifi.run index a55f9b21a6..2545b89e9b 100644 --- a/repos/ports/run/netperf_lwip_wifi.run +++ b/repos/ports/run/netperf_lwip_wifi.run @@ -11,6 +11,11 @@ if {[have_include "power_on/qemu"] || [have_include "power_on/linux"]} { exit 0 } +if { [have_spec muen] } { + puts "Run script does not support Muen." + exit 0 +} + # network configuration set use_nic_bridge 0 set use_wifi_driver 1 diff --git a/repos/ports/run/netperf_lxip_wifi.run b/repos/ports/run/netperf_lxip_wifi.run index f658322b70..6c6a23ab25 100644 --- a/repos/ports/run/netperf_lxip_wifi.run +++ b/repos/ports/run/netperf_lxip_wifi.run @@ -11,6 +11,11 @@ if {[have_include "power_on/qemu"] || [have_include "power_on/linux"]} { exit 0 } +if { [have_spec muen] } { + puts "Run script does not support Muen." + exit 0 +} + # network configuration set use_nic_bridge 0 set use_wifi_driver 1 diff --git a/repos/ports/run/seoul-auto.run b/repos/ports/run/seoul-auto.run index 297f9d5f9e..270110d9a2 100644 --- a/repos/ports/run/seoul-auto.run +++ b/repos/ports/run/seoul-auto.run @@ -9,6 +9,11 @@ assert_spec nova +if { [get_cmd_switch --autopilot] && ![have_include "power_on/qemu"] && [have_spec x86_32] } { + puts "Run script does not support autopilot mode on 32 bit" + exit 0 +} + set use_multiboot 1 set use_genode_iso 0 set use_model_ahci 0 diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index a4c61bbf1a..a30fa67b9a 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -16,6 +16,11 @@ if {([have_spec muen] && [expr $use_vbox5])} { exit 0 } +if { [get_cmd_switch --autopilot] && [have_spec x86_32] } { + puts "Run script does not support autopilot mode on 32 bit" + exit 0 +} + append build_components { core init server/part_blk