ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-02 03:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router.run: use [build_artifacts]

Browse Source 
Issue #4860
This commit is contained in:
Norman Feske 2023-11-17 15:13:36 +01:00 committed by Christian Helmuth
parent aa7058a3b4
commit db72301eb0
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/libports/run/nic_router.inc
View File

@ -3,9 +3,11 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
exit 0 exit 0
} }
set targets "core init timer server/nic_router server/nic_bridge set targets {
core lib/ld init timer lib/libc lib/vfs lib/vfs_lwip
server/report_rom server/nic_router server/nic_bridge server/nic_loopback
test/lwip/http_srv test/lwip/http_clnt test/lwip/udp test/lwip/http_srv test/lwip/http_clnt test/lwip/udp
server/nic_loopback lib/vfs_lwip " }
proc client_bin { prot } { proc client_bin { prot } {
if {$prot == "udp"} { return "test-lwip-udp-client" } if {$prot == "udp"} { return "test-lwip-udp-client" }
@ -70,9 +72,4 @@ proc server_config { name prot ip_addr gateway netmask nic port } {
return $result return $result
} }
set boot_modules "
core init timer nic_router nic_bridge nic_loopback ld.lib.so
libc.lib.so vfs.lib.so vfs_lwip.lib.so [client_bin udp] [server_bin udp]
[client_bin http] [server_bin http] "
append qemu_args "-nographic " append qemu_args "-nographic "

6
repos/libports/run/nic_router.run
View File

@ -21,8 +21,6 @@ proc enable_test_7 { } { return 1 }
source ${genode_dir}/repos/libports/run/nic_router.inc source ${genode_dir}/repos/libports/run/nic_router.inc
lappend targets server/report_rom
build $targets build $targets
create_boot_directory create_boot_directory
@ -378,9 +376,7 @@ append config {
install_config $config install_config $config
lappend boot_modules report_rom build_boot_image [build_artifacts]
build_boot_image $boot_modules
for {set i 0} {$i < $nr_of_clients} {incr i 1} { for {set i 0} {$i < $nr_of_clients} {incr i 1} {
append done_string {.*Test done.*\n} append done_string {.*Test done.*\n}

6
repos/libports/run/nic_router_dyn_config.run
View File

@ -12,7 +12,6 @@ proc enable_test_7 { } { return 0 }
source ${genode_dir}/repos/libports/run/nic_router.inc source ${genode_dir}/repos/libports/run/nic_router.inc
lappend targets server/report_rom
lappend targets server/dynamic_rom lappend targets server/dynamic_rom
build $targets build $targets
@ -423,10 +422,7 @@ append config {
install_config $config install_config $config
lappend boot_modules report_rom build_boot_image [build_artifacts]
lappend boot_modules dynamic_rom
build_boot_image $boot_modules
for {set i 0} {$i < $nr_of_clients} {incr i 1} { for {set i 0} {$i < $nr_of_clients} {incr i 1} {
append done_string {.*Test done.*\n} append done_string {.*Test done.*\n}

13
repos/libports/run/nic_router_ipv4_fragm.run
View File

@ -46,11 +46,11 @@ create_boot_directory
import_from_depot [depot_user]/pkg/[drivers_nic_pkg] import_from_depot [depot_user]/pkg/[drivers_nic_pkg]
build { build {
core init timer server/nic_router app/ping test/lwip/udp core lib/ld init timer lib/libc lib/libm lib/vfs lib/vfs_lwip
server/report_rom } server/nic_router app/ping test/lwip/udp server/report_rom
}
append config {
install_config {
<config> <config>
<parent-provides> <parent-provides>
@ -144,10 +144,7 @@ append config {
</config> } </config> }
install_config $config build_boot_image [build_artifacts]
build_boot_image {
core init timer nic_router ping test-lwip-udp-server ld.lib.so libc.lib.so
libm.lib.so vfs.lib.so vfs_lwip.lib.so report_rom }
# wait for server ip stack to come up # wait for server ip stack to come up
run_genode_until {.*lwIP Nic interface up.*\n} 30 run_genode_until {.*lwIP Nic interface up.*\n} 30