ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

autopilot: adapt runscripts to new run tool 

Related to #1372.
This commit is contained in:
Josef Söntgen 2015-01-08 22:09:08 +01:00 committed by Christian Helmuth
parent e3c37f43a0
commit 88f62b0988
41 changed files with 50 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-linux/run/lx_hybrid_exception.run
View File

@ -52,6 +52,4 @@ build_boot_image $boot_modules
run_genode_until {child "test-lx_hybrid_exception" exited with exit value 0.*\n} 10
puts "Test succeeded"
# vi: set ft=tcl :

2
repos/base-linux/run/lx_hybrid_pthread_ipc.run
View File

@ -45,5 +45,3 @@ build_boot_image $boot_modules
#
run_genode_until "--- finished pthread IPC test ---.*\n" 10
puts "Test succeeded"

4
repos/base/run/affinity.run
View File

@ -57,7 +57,7 @@ lappend_if [have_spec exynos5] boot_modules platform_drv
build_boot_image $boot_modules
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
set want_cpus_x 4
set want_cpus_y 1
set want_cpus_total [expr $want_cpus_x*$want_cpus_y]
@ -74,7 +74,7 @@ set cpus [regexp -inline {Detected [0-9x]+ CPU[ s]\.} $output]
set cpus [regexp -all -inline {[0-9]+} $cpus]
set cpus [expr [lindex $cpus 0] * [lindex $cpus 1]]
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
if {$want_cpus_total != $cpus} {
puts "CPU count is not as expected: $want_cpus_total != $cpus"
exit 1;

4
repos/base/run/mp_server.run
View File

@ -35,7 +35,7 @@ install_config {
build_boot_image "core init test-server-mp"
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
set want_cpus 2
append qemu_args " -nographic -m 64 -smp $want_cpus,cores=$want_cpus "
}
@ -47,7 +47,7 @@ set cpus [regexp -inline {Detected [0-9x]+ CPU[ s]\.} $output]
set cpus [regexp -all -inline {[0-9]+} $cpus]
set cpus [expr [lindex $cpus 0] * [lindex $cpus 1]]
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
if {$want_cpus != $cpus} {
puts "CPU count is not as expected: $want_cpus != $cpus"
exit 1;

2
repos/base/run/rm_fault.run
View File

@ -31,5 +31,3 @@ build_boot_image "core init test-rm_fault"
append qemu_args "-nographic -m 64"
run_genode_until {child "test-rm_fault" exited with exit value 0.*} 10
puts "Test succeeded"

2
repos/base/run/sub_rm.run
View File

@ -59,5 +59,3 @@ if [have_spec linux_x86_32] {
exit -1
}
}
puts "Test succeeded"

2
repos/base/run/thread.run
View File

@ -23,5 +23,3 @@ build_boot_image "core init test-thread"
append qemu_args "-nographic -m 64"
run_genode_until {child "test-thread" exited with exit value 0.*\n} 20
puts "Test succeeded"

1
repos/dde_rump/run/rump_ext2.run
View File

@ -97,4 +97,3 @@ append qemu_args " -m 256 -nographic"
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
exec rm -f bin/ext2.raw
puts "\nTest succeeded\n"

4
repos/libports/run/libc_filesystem_test.inc
View File

@ -30,7 +30,7 @@ if {[have_spec linux]} {
if {[expr [have_spec 64bit] && $use_atapi_drv]} {
puts "ATAPI driver does not support 64 bit."; exit 0 }
if {![is_qemu_available]} {
if {![have_include "power_on/qemu"]} {
puts "\nPlease setup your native sd or hard drive. Remove this fail stop";
puts "check when you have prepared your native environment.\n";
exit 0
@ -219,6 +219,4 @@ run_genode_until ".*child \"test-libc_$filesystem\" exited with exit value 0.*"
exec rm -f $disk_image
puts "\nTest succeeded\n"
# vi: set ft=tcl :

2
repos/libports/run/libc_vfs.run
View File

@ -70,6 +70,4 @@ build_boot_image {
append qemu_args " -m 128 -nographic "
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
puts "\nTest succeeded\n"
# vi: set ft=tcl :

4
repos/libports/run/lwip.run
View File

@ -182,7 +182,7 @@ append qemu_args " -net user -redir tcp:5555::80 "
run_genode_until {.*Start the server loop \.\.\..*} 30
if [is_qemu_available] {
if {[have_include "power_on/qemu"]} {
set uri "http://localhost:5555/"
} else {
set match_string "got IP address (.*)\033.*\n"
@ -203,6 +203,4 @@ if {![regexp {Welcome to our lwIP HTTP server!} $website dummy]} {
exit 2;
}
puts "Test succeeded"
# vi: set ft=tcl :

2
repos/libports/run/moon.run
View File

@ -45,5 +45,3 @@ build_boot_image {
append qemu_args " -nographic -m 64 "
run_genode_until {.*test-moon.*Finished\..*} 30
puts "Test succeeded"

4
repos/libports/run/pthread.run
View File

@ -37,6 +37,4 @@ build_boot_image {
append qemu_args " -nographic -m 64 "
run_genode_until "--- returning from main ---" 10
puts "Test succeeded"
run_genode_until {--- returning from main ---.*\n} 10

1
repos/os/run/blk_cache.run
View File

@ -70,4 +70,3 @@ build_boot_image { core init timer test-blk-srv blk_cache test-blk-cli }
append qemu_args " -nographic -m 64 "
run_genode_until "Tests finished successfully.*\n" 60
puts "Test succeeded"

2
repos/os/run/failsafe.run
View File

@ -73,5 +73,3 @@ build_boot_image $boot_modules
append qemu_args "-nographic -m 64"
run_genode_until "--- finished failsafe test ---.*\n" 30
puts "Test succeeded"

1
repos/os/run/part_blk.run
View File

@ -104,4 +104,3 @@ append qemu_args " -nographic -m 128 "
run_genode_until "Tests finished successfully.*\n.*Tests finished successfully.*\n" 100
exec rm bin/ata.raw
puts "Test succeeded"

2
repos/os/run/resource_request.run
View File

@ -36,5 +36,3 @@ build_boot_image "core init timer test-resource_request"
append qemu_args "-nographic -m 128"
run_genode_until {child "test-resource_request" exited with exit value 0.*\n} 30
puts "Test succeeded"

2
repos/os/run/resource_yield.run
View File

@ -36,5 +36,3 @@ build_boot_image "core init timer test-resource_yield"
append qemu_args "-nographic -m 64"
run_genode_until {--- test-resource_yield finished ---\s*\n} 50
puts "Test succeeded"

2
repos/os/run/rom_blk.run
View File

@ -40,5 +40,3 @@ build_boot_image "core init rom_blk test-rom_blk"
append qemu_args "-m 64 -nographic "
run_genode_until "all done, finished!" 10
puts "Test succeeded"

4
repos/os/run/signal.run
View File

@ -34,6 +34,4 @@ build_boot_image "core init timer test-signal"
append qemu_args "-nographic -m 64"
run_genode_until {child "test-signal" exited with exit value 0.*} 200
puts "Test succeeded"
run_genode_until {.*child "test-signal" exited with exit value 0.*} 200

2
repos/os/run/tar_rom.run
View File

@ -82,5 +82,3 @@ append qemu_args "-nographic -m 64"
run_genode_until "--- timer test ---" 10
exec rm bin/archive.tar
puts "Test succeeded"

2
repos/os/run/thread_join.run
View File

@ -35,5 +35,3 @@ build_boot_image "core init timer test-thread_join"
append qemu_args "-nographic -m 64"
run_genode_until {child "test-thread_join" exited with exit value 0.*\n} 10
puts "Test succeeded"

2
repos/os/run/timed_semaphore.run
View File

@ -57,5 +57,3 @@ build_boot_image $boot_modules
append qemu_args " -m 64 -nographic "
run_genode_until "end of timed-semaphore test" 10
puts "Test succeeded"

2
repos/os/run/timer.run
View File

@ -48,5 +48,3 @@ append qemu_args " -m 64 -nographic"
# Execute test in Qemu
run_genode_until "--- timer test finished ---" 60
puts "Test succeeded"

1
repos/os/run/tz_vmm.run
View File

@ -68,5 +68,4 @@ expect {
timeout { puts stderr "Error: Test execution timed out"; exit -2 }
}
puts "Test succeeded"
exec rm bin/initrd.gz bin/initrd.gz.md5 bin/linux bin/linux.md5

1
repos/ports-foc/run/l4linux.run
View File

@ -195,5 +195,4 @@ expect {
timeout { puts stderr "Error: Test execution timed out"; exit -2 }
}
puts "Test succeeded"
exec rm bin/initrd.gz bin/initrd.gz.md5

3
repos/ports-foc/run/l4linux_netperf.inc
View File

@ -232,7 +232,7 @@ regexp $ip_match $ip_string ip_local
# Remote IP
#
run_genode_until "netif_info: register.*\n" 60
set serial_id $spawn_id
set serial_id [output_spawn_id]
sleep 8
send "ip addr show dev eth0\n"
run_genode_until "inet.*\n" 3 $serial_id
@ -289,7 +289,6 @@ puts " [lindex $throughput_rx 1] MBit/s ok"
exec rm bin/initrd.gz bin/initrd.gz.md5
puts "\nTest succeeded"
close -i $serial_id
exec killall netserver-$version

2
repos/ports-foc/run/l4linux_netperf.run
View File

@ -3,7 +3,7 @@
# \date 2013-07-08
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nNetperf running on Qemu is not supported.\n"
exit
}

2
repos/ports-foc/run/l4linux_netperf_bridge.run
View File

@ -3,7 +3,7 @@
# \date 2013-07-08
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nNetperf running on Qemu is not supported.\n"
exit
}

2
repos/ports-foc/run/l4linux_netperf_usb30.run
View File

@ -3,7 +3,7 @@
# \date 2013-07-08
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nNetperf running on Qemu is not supported.\n"
exit
}

4
repos/ports/run/gdb_monitor.run
View File

@ -10,7 +10,7 @@
# at this time
#
if {![is_qemu_available] || (![have_spec foc] && ![have_spec nova])} {
if {![have_include "power_on/qemu"] || (![have_spec foc] && ![have_spec nova])} {
puts "Run script is only supported for foc or nova in Qemu"; exit 0
}
@ -247,6 +247,4 @@ if {![regexp {thread_stop_myself \(\)} $gdb_output] ||
}
puts "Test succeeded"
# vi: set ft=tcl :

10
repos/ports/run/netperf.inc
View File

@ -4,7 +4,7 @@
# \date 2013-04-18
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nNetperf running on Qemu is not recommended.\n"
exit
}
@ -236,10 +236,10 @@ append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 "
append qemu_args " -net user -redir tcp:12865::12865 -redir tcp:49153::49153 "
run_genode_until {.*and family AF_INET.*} 30
set serial_id $spawn_id
set serial_id [output_spawn_id]
set force_ports ""
if [is_qemu_available] {
if {[have_include "power_on/qemu"]} {
set ip_addr "localhost"
set force_ports "-P 49153,49153"
} elseif [have_spec linux] {
@ -286,7 +286,3 @@ foreach netperf_test $netperf_tests {
}
puts " [lindex $throughput 1] MBit/s ok"
}
puts "\nTest succeeded"
# vi: set ft=tcl :

2
repos/ports/run/netperf_lwip_bridge.run
View File

@ -5,7 +5,7 @@
# \date 2013-07-08
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nNetperf running on Qemu with a bridge is not supported.\n"
exit
}

2
repos/ports/run/netperf_lxip_bridge.run
View File

@ -5,7 +5,7 @@
# \date 2013-07-08
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nNetperf running on Qemu with a bridge is not supported.\n"
exit
}

2
repos/ports/run/noux.run
View File

@ -59,5 +59,3 @@ if {[have_spec x86_64]} {
run_genode_until "child /bin/ls exited with exit value 0.*\n" 30
exec rm bin/coreutils.tar
puts "Test succeeded"

18
repos/ports/run/noux_net_netcat.run
View File

@ -19,7 +19,7 @@ lappend_if $use_nic_driver build_components drivers/nic
lappend_if [have_spec acpi] build_components drivers/acpi
lappend_if [have_spec pci] build_components drivers/pci/device_pd
lappend_if [have_spec gpio] build_components drivers/gpio
lappend_if [is_qemu_available] build_components drivers/uart
lappend_if [have_include "power_on/qemu"] build_components drivers/uart
lappend_if $use_platform_drv build_components drivers/platform
build $build_components
@ -65,7 +65,7 @@ append config {
<provides><service name="Timer"/></provides>
</start>}
append_if [is_qemu_available] config {
append_if [have_include "power_on/qemu"] config {
<start name="uart_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Terminal"/></provides>
@ -74,7 +74,7 @@ append_if [is_qemu_available] config {
</config>
</start>}
if {![is_qemu_available]} {
if {![have_include "power_on/qemu"]} {
append config {
<start name="tcp_terminal">
<resource name="RAM" quantum="5M"/>
@ -166,7 +166,7 @@ append config {
</start>
</config>}
append_if [expr ![is_qemu_available]] config {
append_if [expr ![have_include "power_on/qemu"]] config {
<route>
<service name="Nic"> <child name="nic_bridge"/> </service>
<any-service> <parent/> <any-child/> </any-service>
@ -196,7 +196,7 @@ lappend_if $use_usb_driver boot_modules usb_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec acpi] boot_modules acpi_drv
lappend_if [have_spec nova] boot_modules pci_device_pd
lappend_if [is_qemu_available] boot_modules uart_drv
lappend_if [have_include "power_on/qemu"] boot_modules uart_drv
lappend_if $use_platform_drv boot_modules platform_drv
lappend_if [have_spec gpio] boot_modules gpio_drv
@ -206,7 +206,7 @@ set noux_output_file "noux_output.log"
set serial_ip_addr "localhost"
set noux_ip_addr "localhost"
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
#
# Redirect the output of Noux via the virtual serial port 1 into a file to be
# dumped after the successful completion of the test.
@ -220,10 +220,10 @@ if {[is_qemu_available]} {
append qemu_args " -net user -redir tcp:5555::5555 "
run_genode_until {.*got IP address.*\n} 60
set serial_id $spawn_id
set serial_id [output_spawn_id]
} else {
run_genode_until {\[init -> tcp_terminal\] listening on port 8888\.\.\.} 60
set serial_id $spawn_id
set serial_id [output_spawn_id]
regexp {\[init -> noux_net\] .{1,5}got IP address [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $output noux_ip_addr
regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $noux_ip_addr noux_ip_addr
@ -256,5 +256,3 @@ if {![regexp {Hello Genode} $output dummy]} {
puts stderr "Error: output not as expected"
exit 1
}
puts "Test succeeded"

4
repos/ports/run/noux_tool_chain_auto.run
View File

@ -4,7 +4,7 @@
# \date 2012-11-26
#
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nAuto test running on Qemu is not recommended.\n"
exit 0
}
@ -60,7 +60,7 @@ append qemu_args " -m 768 "
# wait until Noux started
run_genode_until {\[init -\> noux\].*--- noux started ---} $noux_boot_timeout
set serial_id $spawn_id
set serial_id [output_spawn_id]
# start the measurement
set time_start [ clock seconds ]

2
repos/ports/run/seoul-auto.run
View File

@ -62,5 +62,3 @@ run_genode_until {\[init -\> seoul\] VMM: # Hello Genode world!} 300
foreach binary $guest_os_binaries {
exec rm -f bin/$binary
}
puts "Test succeeded"

2
repos/ports/run/virtualbox_auto.inc
View File

@ -1,6 +1,6 @@
assert_spec nova
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nRun script does not support Qemu.\n"
exit
}

8
repos/ports/run/virtualbox_auto_disk.run
View File

@ -1,9 +1,9 @@
# Tested for nova.
assert_spec nova
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nRun script does not support Qemu.\n"
exit
exit 0
}
set vdi_image "win7.vdi"
@ -54,9 +54,7 @@ exec cp ${genode_dir}/repos/ports/run/vm_auto_disk.vbox bin/.
build_boot_image $boot_modules
run_genode_until {\[init -\> vbox\].*Guest Additions capability report:.*seamless: no, hostWindowMapping: no, graphics: no} 70
run_genode_until {\[init -\> vbox\].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} 170 $spawn_id
run_genode_until {\[init -\> vbox\].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} 170 [output_spawn_id]
# cleanup bin directory - remove vbox file
exec rm bin/vm_auto_disk.vbox
puts "\nTest succeeded"

8
repos/ports/run/virtualbox_auto_share.run
View File

@ -57,9 +57,9 @@
# beforehand. test.bat contains the actual instructions to be performed by
# the VM - for this script to copy the test.bin file from D: to E:.
if {[is_qemu_available]} {
if {[have_include "power_on/qemu"]} {
puts "\nRun script does not support Qemu.\n"
exit
exit 0
}
# Tested for nova.
@ -237,7 +237,7 @@ build_boot_image $boot_modules
# Step 2: Read out TCP/IP address of tcp_terminal running on Genode target
#
run_genode_until {\[init -> tcp_terminal\] listening on port 8888\.\.\.} 20
set serial_id $spawn_id
set serial_id [output_spawn_id]
regexp {\[init -> tcp_terminal\] .{1,5}got IP address [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $output serial_ip_addr
regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $serial_ip_addr serial_ip_addr
@ -313,8 +313,8 @@ if {$sha1sum_original eq ""} {
} else {
if {$sha1sum_original != $sha1sum_copy} {
puts "no"
exit -1
} else {
puts "yes"
puts "\nTest succeeded"
}
}