From 63e69d35e022ed1b94e6114c54aad713fa35f750 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 24 Jun 2019 11:03:34 +0200 Subject: [PATCH] Disable unsupported autopilot tests on rpi3 --- repos/gems/run/depot_download.run | 2 +- repos/libports/run/fetchurl.inc | 2 +- repos/libports/run/libc_filesystem_test.inc | 8 ++++---- repos/libports/run/lwip.run | 1 + repos/libports/run/nic_bridge.run | 5 +++++ repos/os/run/fb_bench.run | 1 + repos/os/run/nic_dump.run | 3 ++- repos/os/run/nic_router_flood.run | 1 + repos/os/run/ping.run | 1 + repos/os/run/ping_nic_router.run | 1 + 10 files changed, 18 insertions(+), 7 deletions(-) diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run index 7375a3290..ffdde7290 100644 --- a/repos/gems/run/depot_download.run +++ b/repos/gems/run/depot_download.run @@ -1,6 +1,6 @@ create_boot_directory -if {[have_spec linux] || [have_spec imx7d_sabre] || +if {[have_spec linux] || [have_spec imx7d_sabre] || [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script does not support this platform." exit 0 diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index 091f548c5..f0a9d77fd 100644 --- a/repos/libports/run/fetchurl.inc +++ b/repos/libports/run/fetchurl.inc @@ -4,7 +4,7 @@ # \date 2016-06-05 # -if {[have_spec linux] || [have_spec imx7d_sabre] || +if {[have_spec linux] || [have_spec imx7d_sabre] || [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script does not support this platform." exit 0 diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index cd30bf614..17b48fe2b 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -9,14 +9,14 @@ if {[have_spec odroid_xu] || [have_spec zynq]} { exit 0 } -# use SD on ARM -set use_sd_card_drv [expr [have_spec pbxa9]] +# use SD on Qemu/pbxa9 +set use_sd_card_drv [expr [have_include "power_on/qemu"] && [have_spec pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_block on Linux -set use_ram_block [have_spec linux] +# use ram_block on Linux and Qemu/rpi3 +set use_ram_block [expr [have_spec linux] || [expr [have_include "power_on/qemu"] && [have_spec rpi3]]] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 3e5bf06f1..6c28d2286 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -23,6 +23,7 @@ if {[expr [have_spec linux]] || [expr [have_spec imx53] && [have_spec trustzone]] || [expr [have_spec imx7d_sabre]] || + [have_spec rpi3] || [expr [have_spec riscv]]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index b096ba6a3..e3c4dd52a 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -3,6 +3,11 @@ if {![have_include power_on/qemu]} { exit 0 } +if {[have_spec rpi3]} { + puts "\n Run script is not supported on this platform. \n"; + exit 0 +} + create_boot_directory import_from_depot [depot_user]/src/[base_src] \ diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index cca3d1b7e..4aca65548 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -1,6 +1,7 @@ if {[have_spec odroid_xu] || [have_spec imx7d_sabre] || [have_spec imx6q_sabrelite] || + [have_spec rpi3] || [have_spec zynq] || [have_spec imx53] && [have_spec foc]} { puts "\n Run script is not supported on this platform. \n"; diff --git a/repos/os/run/nic_dump.run b/repos/os/run/nic_dump.run index a50e9b8e5..6b4605f03 100644 --- a/repos/os/run/nic_dump.run +++ b/repos/os/run/nic_dump.run @@ -1,4 +1,5 @@ -if {[have_spec foc] || [have_spec odroid_xu] || [have_spec linux] || [have_spec imx7d_sabre] || +if {[have_spec foc] || [have_spec odroid_xu] || [have_spec linux] || + [have_spec imx7d_sabre] || [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script is not supported on this platform." exit 0 diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run index eb39a512f..aaa2bde00 100644 --- a/repos/os/run/nic_router_flood.run +++ b/repos/os/run/nic_router_flood.run @@ -1,5 +1,6 @@ if {![have_include power_on/qemu] || [have_spec foc] || + [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script is not supported on this platform." diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index 1a9a6939d..aa53607b2 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -1,4 +1,5 @@ if {[have_spec foc] || [have_spec linux] || [have_spec imx7d_sabre] || + [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script is not supported on this platform." exit 0 diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index dbbf17e71..7dcdef062 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -1,4 +1,5 @@ if {[have_spec foc] || [have_spec odroid_xu] || [have_spec linux] || [have_spec imx7d_sabre] || + [have_spec rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script is not supported on this platform." exit 0