From 9e1d776da513b9951543ce7688556198ceffb50d Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 13 Dec 2017 17:02:45 +0100 Subject: [PATCH] nic_router.run: test hub functionality The new test 7 is by now deactivated by default as enabling all tests at a time would trigger resource exhaustion on some platforms. Issue #2609 --- repos/libports/run/nic_router.run | 38 ++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index d1e2c1520a..800ae33f0d 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -8,7 +8,8 @@ proc enable_test_3 { } { return 1 } proc enable_test_4 { } { return 1 } proc enable_test_5 { } { return 1 } proc enable_test_6 { } { return 1 } -proc nr_of_clients { } { return 6 } +proc enable_test_7 { } { return 0 } +proc nr_of_clients { } { return 7 } source ${genode_dir}/repos/libports/run/nic_router.inc @@ -18,8 +19,9 @@ create_boot_directory proc test_1_config { } { if {[enable_test_1]} { return " - [client_config udp_client_1 udp 10.0.98.55 10.0.98.33 255.255.255.0 nic_router 1337 10.0.98.33] - [server_config udp_server_1 udp 10.0.99.55 10.0.99.33 255.255.255.0 nic_router 1337 ]" } + [client_config udp_client_1 udp 10.0.98.55 10.0.98.33 255.255.255.0 nic_router 1337 10.0.98.33] + [client_config lan_1_udp_client_1 udp 10.0.99.56 10.0.99.33 255.255.255.0 nic_router 1337 10.0.99.55] + [server_config lan_1_udp_server_1 udp 10.0.99.55 10.0.99.33 255.255.255.0 nic_router 1337 ]" } } proc test_2_config { } { @@ -52,6 +54,15 @@ proc test_6_config { } { [server_config http_server_3 http 10.0.2.203 10.0.2.1 255.255.255.0 nic_bridge 2345 ]" } } +proc test_7_config { } { + if {[enable_test_7]} { return " + [client_config lan_2_client_1 http 100.200.0.128 100.200.0.1 255.255.0.0 nic_router 2345 10.0.2.204] + [client_config lan_2_client_2 http 100.200.0.64 100.200.0.1 255.255.0.0 nic_router 3456 10.0.2.240] + [client_config lan_2_client_3 http 100.200.0.32 100.200.0.1 255.255.0.0 nic_router 3456 10.0.2.240] + [server_config lan_3_server_1 http 10.0.2.204 10.0.2.1 255.255.255.0 nic_router 2345 ] + [server_config lan_3_server_2 http 10.0.2.240 10.0.2.1 255.255.255.0 nic_router 3456 ]" } +} + append config { @@ -98,7 +109,7 @@ append config { - + @@ -110,7 +121,7 @@ append config { - + @@ -125,9 +136,23 @@ append config { - + + + + + + + + + + + + + + + @@ -158,6 +183,7 @@ append config { } [test_4_config] { } [test_5_config] { } [test_6_config] { + } [test_7_config] { }