From 88f62b09885dc874dfb76aebee6b3d4e80ad9ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Thu, 8 Jan 2015 22:09:08 +0100 Subject: [PATCH] autopilot: adapt runscripts to new run tool Related to #1372. --- repos/base-linux/run/lx_hybrid_exception.run | 2 - .../base-linux/run/lx_hybrid_pthread_ipc.run | 2 - repos/base/run/affinity.run | 4 +- repos/base/run/mp_server.run | 4 +- repos/base/run/rm_fault.run | 2 - repos/base/run/sub_rm.run | 2 - repos/base/run/thread.run | 2 - repos/dde_rump/run/rump_ext2.run | 1 - repos/libports/run/libc_filesystem_test.inc | 4 +- repos/libports/run/libc_vfs.run | 2 - repos/libports/run/lwip.run | 4 +- repos/libports/run/moon.run | 2 - repos/libports/run/pthread.run | 4 +- repos/os/run/blk_cache.run | 1 - repos/os/run/failsafe.run | 2 - repos/os/run/part_blk.run | 1 - repos/os/run/resource_request.run | 2 - repos/os/run/resource_yield.run | 2 - repos/os/run/rom_blk.run | 2 - repos/os/run/signal.run | 4 +- repos/os/run/tar_rom.run | 2 - repos/os/run/thread_join.run | 2 - repos/os/run/timed_semaphore.run | 2 - repos/os/run/timer.run | 2 - repos/os/run/tz_vmm.run | 1 - repos/ports-foc/run/l4linux.run | 1 - repos/ports-foc/run/l4linux_netperf.inc | 3 +- repos/ports-foc/run/l4linux_netperf.run | 2 +- .../ports-foc/run/l4linux_netperf_bridge.run | 2 +- repos/ports-foc/run/l4linux_netperf_usb30.run | 2 +- repos/ports/run/gdb_monitor.run | 4 +- repos/ports/run/netperf.inc | 12 ++--- repos/ports/run/netperf_lwip_bridge.run | 2 +- repos/ports/run/netperf_lxip_bridge.run | 2 +- repos/ports/run/noux.run | 2 - repos/ports/run/noux_net_netcat.run | 44 +++++++++---------- repos/ports/run/noux_tool_chain_auto.run | 4 +- repos/ports/run/seoul-auto.run | 2 - repos/ports/run/virtualbox_auto.inc | 2 +- repos/ports/run/virtualbox_auto_disk.run | 8 ++-- repos/ports/run/virtualbox_auto_share.run | 8 ++-- 41 files changed, 50 insertions(+), 108 deletions(-) diff --git a/repos/base-linux/run/lx_hybrid_exception.run b/repos/base-linux/run/lx_hybrid_exception.run index 9c625e806..be396641c 100644 --- a/repos/base-linux/run/lx_hybrid_exception.run +++ b/repos/base-linux/run/lx_hybrid_exception.run @@ -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 : diff --git a/repos/base-linux/run/lx_hybrid_pthread_ipc.run b/repos/base-linux/run/lx_hybrid_pthread_ipc.run index 689bd28d5..eeb696ecb 100644 --- a/repos/base-linux/run/lx_hybrid_pthread_ipc.run +++ b/repos/base-linux/run/lx_hybrid_pthread_ipc.run @@ -45,5 +45,3 @@ build_boot_image $boot_modules # run_genode_until "--- finished pthread IPC test ---.*\n" 10 - -puts "Test succeeded" diff --git a/repos/base/run/affinity.run b/repos/base/run/affinity.run index 2ddba616f..d95d6d8b1 100644 --- a/repos/base/run/affinity.run +++ b/repos/base/run/affinity.run @@ -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; diff --git a/repos/base/run/mp_server.run b/repos/base/run/mp_server.run index 35f0b74c2..84c99b3e5 100644 --- a/repos/base/run/mp_server.run +++ b/repos/base/run/mp_server.run @@ -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; diff --git a/repos/base/run/rm_fault.run b/repos/base/run/rm_fault.run index 7e3e60f80..919da24db 100644 --- a/repos/base/run/rm_fault.run +++ b/repos/base/run/rm_fault.run @@ -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" diff --git a/repos/base/run/sub_rm.run b/repos/base/run/sub_rm.run index d0db11424..de561dc44 100644 --- a/repos/base/run/sub_rm.run +++ b/repos/base/run/sub_rm.run @@ -59,5 +59,3 @@ if [have_spec linux_x86_32] { exit -1 } } - -puts "Test succeeded" diff --git a/repos/base/run/thread.run b/repos/base/run/thread.run index 0e5821587..eeb072a94 100644 --- a/repos/base/run/thread.run +++ b/repos/base/run/thread.run @@ -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" diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 736d389a2..8800307c9 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -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" diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index 6bcbb9bf0..71996ea56 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -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 : diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run index d564d9e54..4daf3230e 100644 --- a/repos/libports/run/libc_vfs.run +++ b/repos/libports/run/libc_vfs.run @@ -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 : diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index b120c4163..25d313440 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -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 : diff --git a/repos/libports/run/moon.run b/repos/libports/run/moon.run index 0ebc06f05..9b4a51029 100644 --- a/repos/libports/run/moon.run +++ b/repos/libports/run/moon.run @@ -45,5 +45,3 @@ build_boot_image { append qemu_args " -nographic -m 64 " run_genode_until {.*test-moon.*Finished\..*} 30 - -puts "Test succeeded" diff --git a/repos/libports/run/pthread.run b/repos/libports/run/pthread.run index 047bc619b..cb7427cca 100644 --- a/repos/libports/run/pthread.run +++ b/repos/libports/run/pthread.run @@ -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 diff --git a/repos/os/run/blk_cache.run b/repos/os/run/blk_cache.run index 4a33d9c44..7555874ef 100644 --- a/repos/os/run/blk_cache.run +++ b/repos/os/run/blk_cache.run @@ -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" diff --git a/repos/os/run/failsafe.run b/repos/os/run/failsafe.run index fb3784b5f..9cbc7688e 100644 --- a/repos/os/run/failsafe.run +++ b/repos/os/run/failsafe.run @@ -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" diff --git a/repos/os/run/part_blk.run b/repos/os/run/part_blk.run index 378b39f69..d47d9f8a4 100644 --- a/repos/os/run/part_blk.run +++ b/repos/os/run/part_blk.run @@ -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" diff --git a/repos/os/run/resource_request.run b/repos/os/run/resource_request.run index e6f60c4ec..def804e3f 100644 --- a/repos/os/run/resource_request.run +++ b/repos/os/run/resource_request.run @@ -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" diff --git a/repos/os/run/resource_yield.run b/repos/os/run/resource_yield.run index 8b6ad71a2..a1e6db22c 100644 --- a/repos/os/run/resource_yield.run +++ b/repos/os/run/resource_yield.run @@ -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" diff --git a/repos/os/run/rom_blk.run b/repos/os/run/rom_blk.run index 05fa16b9b..3a28b7925 100644 --- a/repos/os/run/rom_blk.run +++ b/repos/os/run/rom_blk.run @@ -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" diff --git a/repos/os/run/signal.run b/repos/os/run/signal.run index f36aa275f..1990308c8 100644 --- a/repos/os/run/signal.run +++ b/repos/os/run/signal.run @@ -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 diff --git a/repos/os/run/tar_rom.run b/repos/os/run/tar_rom.run index 1dd655c6e..97b596d39 100644 --- a/repos/os/run/tar_rom.run +++ b/repos/os/run/tar_rom.run @@ -82,5 +82,3 @@ append qemu_args "-nographic -m 64" run_genode_until "--- timer test ---" 10 exec rm bin/archive.tar - -puts "Test succeeded" diff --git a/repos/os/run/thread_join.run b/repos/os/run/thread_join.run index 992eb4235..5ee143ccf 100644 --- a/repos/os/run/thread_join.run +++ b/repos/os/run/thread_join.run @@ -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" diff --git a/repos/os/run/timed_semaphore.run b/repos/os/run/timed_semaphore.run index e01d1f1ef..9a45eed0c 100644 --- a/repos/os/run/timed_semaphore.run +++ b/repos/os/run/timed_semaphore.run @@ -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" diff --git a/repos/os/run/timer.run b/repos/os/run/timer.run index d7eee1ff0..a6c0f55e8 100644 --- a/repos/os/run/timer.run +++ b/repos/os/run/timer.run @@ -48,5 +48,3 @@ append qemu_args " -m 64 -nographic" # Execute test in Qemu run_genode_until "--- timer test finished ---" 60 - -puts "Test succeeded" diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 6de798a3e..af10dcaa1 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -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 diff --git a/repos/ports-foc/run/l4linux.run b/repos/ports-foc/run/l4linux.run index df1383559..d02ce22a2 100644 --- a/repos/ports-foc/run/l4linux.run +++ b/repos/ports-foc/run/l4linux.run @@ -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 diff --git a/repos/ports-foc/run/l4linux_netperf.inc b/repos/ports-foc/run/l4linux_netperf.inc index 2aa9f55de..70c6b0bbe 100644 --- a/repos/ports-foc/run/l4linux_netperf.inc +++ b/repos/ports-foc/run/l4linux_netperf.inc @@ -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 diff --git a/repos/ports-foc/run/l4linux_netperf.run b/repos/ports-foc/run/l4linux_netperf.run index 06873b529..e20d0df86 100644 --- a/repos/ports-foc/run/l4linux_netperf.run +++ b/repos/ports-foc/run/l4linux_netperf.run @@ -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 } diff --git a/repos/ports-foc/run/l4linux_netperf_bridge.run b/repos/ports-foc/run/l4linux_netperf_bridge.run index f07835c97..03ca833a3 100644 --- a/repos/ports-foc/run/l4linux_netperf_bridge.run +++ b/repos/ports-foc/run/l4linux_netperf_bridge.run @@ -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 } diff --git a/repos/ports-foc/run/l4linux_netperf_usb30.run b/repos/ports-foc/run/l4linux_netperf_usb30.run index 26153d850..5e24d9ba3 100644 --- a/repos/ports-foc/run/l4linux_netperf_usb30.run +++ b/repos/ports-foc/run/l4linux_netperf_usb30.run @@ -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 } diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run index e879a7bea..33ead46e9 100644 --- a/repos/ports/run/gdb_monitor.run +++ b/repos/ports/run/gdb_monitor.run @@ -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 : diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 791aaab4d..5b2fd55e6 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -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 } @@ -44,7 +44,7 @@ if {$wrong_version} { set packet_size 1024 set netperf_tests "TCP_STREAM TCP_MAERTS" -# start run script generation +# start run script generation if {$use_usb_driver} { set network_driver "usb_drv" } if {$use_nic_driver} { set network_driver "nic_drv" } @@ -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 : diff --git a/repos/ports/run/netperf_lwip_bridge.run b/repos/ports/run/netperf_lwip_bridge.run index b9f7fd616..af83e2719 100644 --- a/repos/ports/run/netperf_lwip_bridge.run +++ b/repos/ports/run/netperf_lwip_bridge.run @@ -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 } diff --git a/repos/ports/run/netperf_lxip_bridge.run b/repos/ports/run/netperf_lxip_bridge.run index 963f38148..e45503783 100644 --- a/repos/ports/run/netperf_lxip_bridge.run +++ b/repos/ports/run/netperf_lxip_bridge.run @@ -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 } diff --git a/repos/ports/run/noux.run b/repos/ports/run/noux.run index c51ad694c..a3ffebab4 100644 --- a/repos/ports/run/noux.run +++ b/repos/ports/run/noux.run @@ -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" diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index 7772baf34..8985bb2ac 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -14,13 +14,13 @@ set build_components { noux-pkg/netcat } -lappend_if $use_usb_driver build_components drivers/usb -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 $use_platform_drv build_components drivers/platform +lappend_if $use_usb_driver build_components drivers/usb +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 [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 { } -append_if [is_qemu_available] config { +append_if [have_include "power_on/qemu"] config { @@ -74,7 +74,7 @@ append_if [is_qemu_available] config { } -if {![is_qemu_available]} { +if {![have_include "power_on/qemu"]} { append config { @@ -166,7 +166,7 @@ append config { } -append_if [expr ![is_qemu_available]] config { +append_if [expr ![have_include "power_on/qemu"]] config { @@ -191,14 +191,14 @@ set boot_modules { } # platform-specific modules -lappend_if $use_nic_driver boot_modules nic_drv -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 $use_platform_drv boot_modules platform_drv -lappend_if [have_spec gpio] boot_modules gpio_drv +lappend_if $use_nic_driver boot_modules nic_drv +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 [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 build_boot_image $boot_modules @@ -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" diff --git a/repos/ports/run/noux_tool_chain_auto.run b/repos/ports/run/noux_tool_chain_auto.run index f6c36a0bd..35447d3a5 100644 --- a/repos/ports/run/noux_tool_chain_auto.run +++ b/repos/ports/run/noux_tool_chain_auto.run @@ -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 ] diff --git a/repos/ports/run/seoul-auto.run b/repos/ports/run/seoul-auto.run index 0339bfd4c..38be800a8 100644 --- a/repos/ports/run/seoul-auto.run +++ b/repos/ports/run/seoul-auto.run @@ -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" diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index e2671beaa..8c99be0f9 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -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 } diff --git a/repos/ports/run/virtualbox_auto_disk.run b/repos/ports/run/virtualbox_auto_disk.run index 1d97ceb81..4e1dfdd81 100644 --- a/repos/ports/run/virtualbox_auto_disk.run +++ b/repos/ports/run/virtualbox_auto_disk.run @@ -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" diff --git a/repos/ports/run/virtualbox_auto_share.run b/repos/ports/run/virtualbox_auto_share.run index 3c8628e5d..a9e4e1a94 100644 --- a/repos/ports/run/virtualbox_auto_share.run +++ b/repos/ports/run/virtualbox_auto_share.run @@ -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" } }