From 71ce1442c8cc97e552214b75b3a9fe4e3c7723a0 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Thu, 27 Jun 2019 19:42:01 +0200 Subject: [PATCH] run: enable 'imx7d_sabre' in network tests Fixes #3434 --- repos/gems/run/depot_download.run | 2 +- repos/libports/run/fetchurl.inc | 2 +- repos/libports/run/lwip.run | 1 - repos/os/run/nic_dump.run | 2 +- repos/os/run/ping.run | 2 +- repos/os/run/ping_nic_router.run | 2 +- repos/ports/run/netperf.inc | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run index ffdde72902..038313bec2 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] || [have_spec rpi3] || +if {[have_spec linux] || [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 f0a9d77fd8..173376e960 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] || [have_spec rpi3] || +if {[have_spec linux] || [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/lwip.run b/repos/libports/run/lwip.run index 6c28d22860..679c074814 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -22,7 +22,6 @@ 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/os/run/nic_dump.run b/repos/os/run/nic_dump.run index 6b4605f034..b063baa8c0 100644 --- a/repos/os/run/nic_dump.run +++ b/repos/os/run/nic_dump.run @@ -1,5 +1,5 @@ if {[have_spec foc] || [have_spec odroid_xu] || [have_spec linux] || - [have_spec imx7d_sabre] || [have_spec rpi3] || + [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.run b/repos/os/run/ping.run index aa53607b27..bd138ff9b5 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -1,4 +1,4 @@ -if {[have_spec foc] || [have_spec linux] || [have_spec imx7d_sabre] || +if {[have_spec foc] || [have_spec linux] || [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_nic_router.run b/repos/os/run/ping_nic_router.run index 7dcdef0629..acc9a890a8 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -1,4 +1,4 @@ -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 rpi3] || [expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script is not supported on this platform." diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index de1b8b1ab9..f01ed78246 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -21,7 +21,7 @@ if {[have_include "power_on/qemu"] && exit 0 } -if {[expr [have_spec imx53] && [have_spec trustzone]] || [have_spec imx7d_sabre]} { +if {[expr [have_spec imx53] && [have_spec trustzone]]} { puts "Run script is not supported on this platform." exit 0 }