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

Fix network_test run scripts for recent changes

Browse Source 
Fix #833
This commit is contained in:
Stefan Kalkowski 2013-07-18 15:33:26 +02:00 committed by Norman Feske
parent 55e1c16c98
commit 3a6f639df8
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libports/run/network_test.inc
View File

@ -22,6 +22,7 @@ set build_components {
lappend_if $use_nic_bridge build_components server/nic_bridge lappend_if $use_nic_bridge build_components server/nic_bridge
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/platform
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb lappend_if [expr [have_spec omap4] || [have_spec exynos5]] build_components drivers/usb
lappend_if [have_spec acpi] build_components drivers/acpi 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/device_pd
@ -64,16 +65,16 @@ append_if $use_nic_bridge config {
<provides><service name="Nic"/></provides> <provides><service name="Nic"/></provides>
<route> <route>
<service name="Nic"> } <service name="Nic"> }
append_if [expr $use_nic_bridge && ([have_spec omap4] || [have_spec exynos5])] config { append_if [expr $use_nic_bridge && ([have_spec omap4] || [have_spec exynos5])] config {
<child name="usb_drv"/> } <child name="usb_drv"/> }
append_if [expr $use_nic_bridge && (![have_spec omap4] && ![have_spec exynos5])] config { append_if [expr $use_nic_bridge && (![have_spec omap4] && ![have_spec exynos5])] config {
<child name="nic_drv"/> } <child name="nic_drv"/> }
append_if $use_nic_bridge config { append_if $use_nic_bridge config {
</service> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> } </start> }
append config " append config "
<start name=\"$test_server_name\">" <start name=\"$test_server_name\">"
append config { append config {
@ -89,13 +90,19 @@ append config {
</route> </route>
</start> } </start> }
append_if [have_spec exynos5] config {
<start name="platform_drv">
<resource name="RAM" quantum="4M"/>
<provides><service name="Regulator"/></provides>
</start>}
append_if [expr [have_spec omap4] || [have_spec exynos5]] config { append_if [expr [have_spec omap4] || [have_spec exynos5]] config {
<start name="usb_drv" priority="-1"> <start name="usb_drv">
<resource name="RAM" quantum="12M"/> <resource name="RAM" quantum="12M"/>
<provides> <provides>
<service name="Nic"/> <service name="Nic"/>
</provides> </provides>
<config> <config ehci="yes">
<nic mac="2e:60:90:0c:4e:02" /> <nic mac="2e:60:90:0c:4e:02" />
<!--<nic mac="aa:bb:cc:dd:ee:00" />--> <!--<nic mac="aa:bb:cc:dd:ee:00" />-->
</config> </config>
@ -153,6 +160,7 @@ lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv lappend_if [expr [have_spec omap4] || [have_spec exynos5]] boot_modules usb_drv
lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv lappend_if [expr ![have_spec omap4] && ![have_spec exynos5]] boot_modules nic_drv
lappend_if [have_spec nova] boot_modules pci_device_pd lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [have_spec exynos5] boot_modules platform_drv
build_boot_image $boot_modules build_boot_image $boot_modules
@ -176,7 +184,7 @@ exec g++ -o bin/network_test_client \
$pingpong_dir/client/main.cc \ $pingpong_dir/client/main.cc \
$pingpong_dir/pingpong.cc \ $pingpong_dir/pingpong.cc \
-I $pingpong_dir -I $pingpong_dir
# start the client # start the client
spawn bin/network_test_client \ spawn bin/network_test_client \
-serverip $ip_addr \ -serverip $ip_addr \
@ -217,7 +225,6 @@ puts "\nTest succeeded in $test_result."
# disconnect from server system # disconnect from server system
if {[expr [have_spec omap4] || [have_spec exynos5]]} { if {[expr [have_spec omap4] || [have_spec exynos5]]} {
send -i $server_spawn_id "\x01\x18" ;# Ctrl-A Ctrl-X send -i $server_spawn_id "\x01\x18" ;# Ctrl-A Ctrl-X
run_genode_until "Thanks for using picocom" 60 $server_spawn_id
} }
exec rm -f bin/network_test_client exec rm -f bin/network_test_client