From 6a40c5c13d40b09c0acd70f8d7cec52621e2d3ea Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 15 Aug 2016 10:23:34 +0200 Subject: [PATCH] libports: remove deprecated network_* tests Ref #114 --- repos/libports/run/network_test.inc | 248 ------------------ repos/libports/run/network_test.run | 20 -- repos/libports/run/network_test_libc_lwip.run | 4 - .../run/network_test_libc_lwip_nic_bridge.run | 4 - repos/libports/run/network_test_lwip.run | 4 - .../run/network_test_lwip_nic_bridge.run | 4 - 6 files changed, 284 deletions(-) delete mode 100644 repos/libports/run/network_test.inc delete mode 100644 repos/libports/run/network_test.run delete mode 100644 repos/libports/run/network_test_libc_lwip.run delete mode 100644 repos/libports/run/network_test_libc_lwip_nic_bridge.run delete mode 100644 repos/libports/run/network_test_lwip.run delete mode 100644 repos/libports/run/network_test_lwip_nic_bridge.run diff --git a/repos/libports/run/network_test.inc b/repos/libports/run/network_test.inc deleted file mode 100644 index ab89fc430..000000000 --- a/repos/libports/run/network_test.inc +++ /dev/null @@ -1,248 +0,0 @@ -# -# \brief Test ping -# \author Josef Soentgen -# \date 2013-01-06 -# - -# -# Client parameters -# -set packet_payload_size 10 -set packet_count 1000000 - -if {[have_spec hw_odroid_xu]} { - puts "Run script does not support this platform." - exit 0 -} - -# -# Build -# - -set build_components { - core init - drivers/timer drivers/nic - test/lwip/pingpong/server -} - -lappend_if $use_nic_bridge build_components server/nic_bridge - -lappend_if [expr [have_spec omap4] || [have_spec arndale]] build_components drivers/platform -lappend_if [expr [have_spec omap4] || [have_spec arndale]] build_components drivers/usb -lappend_if [have_spec acpi] build_components drivers/acpi -lappend_if [have_spec pci] build_components drivers/pci/device_pd -lappend_if [have_spec pci] build_components drivers/pci - -build $build_components - -create_boot_directory - -# -# Generate config -# - -set config { - - - - - - - - - - - - - - - - - - - } - -append_if $use_nic_bridge config { - - - - - - } -append_if [expr $use_nic_bridge && ([have_spec omap4] || [have_spec arndale])] config { - } -append_if [expr $use_nic_bridge && (![have_spec omap4] && ![have_spec arndale])] config { - } -append_if $use_nic_bridge config { - - - - } - -append config " - " -append config { - - - - - - - - } -append_if $use_nic_bridge config { - } -append config { - - - } - -append_if [have_spec arndale] config { - - - - } - -append_if [expr [have_spec omap4] || [have_spec arndale]] config { - - - - - - - - - - } - -append_if [expr ![have_spec omap4] && ![have_spec arndale]] config { - - - - } - -append_if [have_spec acpi] config { - - - - - - - - - - - - } - -append_if [expr ![have_spec acpi] && [have_spec pci]] config { - - - - } - -append config { - -} - -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core init timer - ld.lib.so libc.lib.so lwip.lib.so -} - -lappend_if $use_nic_bridge boot_modules nic_bridge - -lappend boot_modules $test_server_name - -# platform-specific modules -lappend_if [have_spec pci] boot_modules pci_drv -lappend_if [have_spec acpi] boot_modules acpi_drv -lappend_if [expr [have_spec omap4] || [have_spec arndale]] boot_modules usb_drv -lappend_if [expr ![have_spec omap4] && ![have_spec arndale]] boot_modules nic_drv -lappend_if [have_spec nova] boot_modules pci_device_pd -lappend_if [have_spec arndale] boot_modules platform_drv - -build_boot_image $boot_modules - -append qemu_args " -net user,hostfwd=tcp::10000-:10000 " -append qemu_args " -nographic -serial mon:stdio " - -# get IP address from server -set match_string "got IP address (.*)\033.*\n" -run_genode_until $match_string 30 -if {[have_include power_on/qemu]} { - set server_spawn_id $output_spawn_id - set ip_addr "127.0.0.1" -} else { - set server_spawn_id $spawn_id - regexp $match_string $output all ip_addr -} - -puts "got server IP address: $ip_addr" - -set match_string "wait....*\n" -if {![regexp $match_string $output] } { - # wait until the server is ready - run_genode_until $match_string 30 $server_spawn_id -} - -# build the client -set pingpong_dir $genode_dir/repos/libports/src/test/lwip/pingpong -exec g++ -o bin/network_test_client \ - $pingpong_dir/client/main.cc \ - $pingpong_dir/pingpong.cc \ - -I $pingpong_dir - -# start the client -spawn bin/network_test_client \ - -serverip $ip_addr \ - -startsize $packet_payload_size \ - -endsize $packet_payload_size \ - -count $packet_count - -# wait until the client is connected to the server -run_genode_until "client \[1|3\] connected..." 60 $server_spawn_id - -# start counting the execution time -set time_start [clock milliseconds] - -# wait until the server received all packets -run_genode_until "received .*\n" 600 $server_spawn_id - -# stop counting the execution time -set time_end [clock milliseconds] - -# get received packet size and count from target -set target_packet_size [regexp -inline {received [0-9]+ packets of size [0-9]+} $output] -set target_packet_size [regexp -all -inline {[0-9]+} $target_packet_size] -set target_packet_count [lindex $target_packet_size 0] -set target_packet_size [lindex $target_packet_size 1] - -# calculate troughput -set milliseconds [expr $time_end - $time_start] -set payload_total [expr $target_packet_count * $target_packet_size] -set payload_bytes_per_second [expr $payload_total * 1000 / $milliseconds ] - - -puts "! PERF: $target_packet_size\_data [expr $payload_bytes_per_second * 8 / 1000 / 1000] MBit/s ok" - -set test_result "$milliseconds ms. payload ($target_packet_size Byte): $payload_bytes_per_second Byte/s" - -puts "\nTest succeeded in $test_result." - -# disconnect from server system -if {[expr [have_spec omap4] || [have_spec arndale]]} { - send -i $server_spawn_id "\x01\x18" ;# Ctrl-A Ctrl-X -} - -set qemu_args "" -exec rm -f bin/network_test_client - -# vi: set ft=tcl : diff --git a/repos/libports/run/network_test.run b/repos/libports/run/network_test.run deleted file mode 100644 index 6f23d6306..000000000 --- a/repos/libports/run/network_test.run +++ /dev/null @@ -1,20 +0,0 @@ -source ${genode_dir}/repos/libports/run/network_test_lwip.run -set test_result_lwip $test_result - -source ${genode_dir}/repos/libports/run/network_test_lwip_nic_bridge.run -set test_result_lwip_nic_bridge $test_result - -source ${genode_dir}/repos/libports/run/network_test_libc_lwip.run -set test_result_libc_lwip $test_result - -source ${genode_dir}/repos/libports/run/network_test_libc_lwip_nic_bridge.run -set test_result_libc_lwip_nic_bridge $test_result - -puts "\nTest results:\n" -puts "lwip: $test_result_lwip" -puts "lwip_nic_bridge: $test_result_lwip_nic_bridge" -puts "libc_lwip: $test_result_libc_lwip" -puts "libc_lwip_nic_bridge: $test_result_libc_lwip_nic_bridge" -puts "" - -puts "Test succeeded" diff --git a/repos/libports/run/network_test_libc_lwip.run b/repos/libports/run/network_test_libc_lwip.run deleted file mode 100644 index 3b6eb4cd4..000000000 --- a/repos/libports/run/network_test_libc_lwip.run +++ /dev/null @@ -1,4 +0,0 @@ -set use_nic_bridge 0 -set test_server_name "test-ping_server_libc_lwip" - -source ${genode_dir}/repos/libports/run/network_test.inc diff --git a/repos/libports/run/network_test_libc_lwip_nic_bridge.run b/repos/libports/run/network_test_libc_lwip_nic_bridge.run deleted file mode 100644 index 6c3006884..000000000 --- a/repos/libports/run/network_test_libc_lwip_nic_bridge.run +++ /dev/null @@ -1,4 +0,0 @@ -set use_nic_bridge 1 -set test_server_name "test-ping_server_libc_lwip" - -source ${genode_dir}/repos/libports/run/network_test.inc diff --git a/repos/libports/run/network_test_lwip.run b/repos/libports/run/network_test_lwip.run deleted file mode 100644 index c7eb86b71..000000000 --- a/repos/libports/run/network_test_lwip.run +++ /dev/null @@ -1,4 +0,0 @@ -set use_nic_bridge 0 -set test_server_name "test-ping_server_lwip" - -source ${genode_dir}/repos/libports/run/network_test.inc diff --git a/repos/libports/run/network_test_lwip_nic_bridge.run b/repos/libports/run/network_test_lwip_nic_bridge.run deleted file mode 100644 index 74a92b360..000000000 --- a/repos/libports/run/network_test_lwip_nic_bridge.run +++ /dev/null @@ -1,4 +0,0 @@ -set use_nic_bridge 1 -set test_server_name "test-ping_server_lwip" - -source ${genode_dir}/repos/libports/run/network_test.inc