diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index bf276fc6c..17775faa1 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -93,7 +93,7 @@ append_if [have_spec gpio] config " append_if $use_usb_driver config { - + diff --git a/repos/libports/run/nic_dump.run b/repos/libports/run/nic_dump.run index 7bdbdaef6..90a569113 100644 --- a/repos/libports/run/nic_dump.run +++ b/repos/libports/run/nic_dump.run @@ -64,7 +64,7 @@ proc nic_drv_config { } { if {[nic_drv] == "usb_drv"} { append result { - + @@ -84,11 +84,16 @@ proc server_bin { prot } { if {$prot == "udp"} { return "test-lxip_udp_echo" } if {$prot == "http"} { return "test-lwip_httpsrv_static" } } +proc ram_quota { prot } { + if {$prot == "udp"} { return 28M } + if {$prot == "http"} { return 12M } +} + proc client_config { prot index ip_addr gateway netmask nic srv_port srv_ip } { append result { - + @@ -106,7 +111,7 @@ proc server_config { prot index ip_addr gateway netmask nic port } { append result { - + diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index d17d1e659..f61970856 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -68,7 +68,7 @@ proc nic_drv_config { } { if {[nic_drv] == "usb_drv"} { append result { - + @@ -88,11 +88,16 @@ proc server_bin { prot } { if {$prot == "udp"} { return "test-lxip_udp_echo" } if {$prot == "http"} { return "test-lwip_httpsrv_static" } } +proc ram_quota { prot } { + if {$prot == "udp"} { return 28M } + if {$prot == "http"} { return 12M } +} + proc client_config { prot index ip_addr gateway netmask nic srv_port srv_ip } { append result { - + @@ -110,7 +115,7 @@ proc server_config { prot index ip_addr gateway netmask nic port } { append result { - + @@ -277,6 +282,6 @@ proc nic_qemu_args { } { if {[have_spec x86]} { return "-net nic,model=e1000" } if {[have_spec lan9118]} { return "-net nic,model=lan9118" } } -append qemu_args "-m 400 -nographic -net user -redir udp:5555::1337 [nic_qemu_args]" +append qemu_args "-m 384 -nographic -net user -redir udp:5555::1337 [nic_qemu_args]" run_genode_until {.*Test done.*\n.*Test done.*\n.*Test done.*\n.*Test done.*\n.*Test done.*\n.*Test done.*\n} 60 diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index fac722a6f..046748f76 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -149,9 +149,14 @@ append_if $use_nic_bridge config { } +proc usb_drv_ram_quota {} { + if {[have_spec x86]} { return 18M } + return 14M +} + append_if $use_usb_driver config { - + } @@ -165,7 +170,7 @@ append_if $use_usb_driver config { append_if $use_nic_driver config { - + } diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index ff3e21893..eeff78066 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -92,7 +92,7 @@ append config { - + }