ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 05:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run: extend genode_until_run by a spawn id

Browse Source 
genode_until_run can be called now with a spawn id to able to reattach to a
spawned process (amt, serial output). Run scripts can now call genode_until_run
multiple times.
This commit is contained in:
Alexander Boettcher 2013-04-08 10:43:05 +02:00 committed by Norman Feske
parent 267239147a
commit 2a761c7fea
9 changed files with 157 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
base-codezero/run/env
View File

@ -83,6 +83,24 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
spawn_qemu $wait_for_re $timeout_value } #
# If a running_spawn_id is specified, wait for the expected output
#
if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
}
#
# Try to use one of the supported backends for running the scripts
#
if {[is_qemu_available]} {
spawn_qemu $wait_for_re $timeout_value
return
}
global run_target
puts stderr "Error: Can't execute automatically on target '$run_target'"
exit -1
}

28
base-fiasco/run/env
View File

@ -172,10 +172,28 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
if {[is_amt_available]} { #
spawn_amt $wait_for_re $timeout_value; # If a running_spawn_id is specified, wait for the expected output
} else { #
spawn_qemu $wait_for_re $timeout_value; if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
} }
#
# Try to use one of the supported backends for running the scripts
#
if {[is_amt_available]} {
spawn_amt $wait_for_re $timeout_value
return
}
if {[is_qemu_available]} {
spawn_qemu $wait_for_re $timeout_value
return
}
global run_target
puts stderr "Error: Can't execute automatically on target '$run_target'"
exit -1
} }

22
base-foc/run/env
View File

@ -278,10 +278,24 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
#
# If a running_spawn_id is specified, wait for the expected output
#
if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
}
#
# Try to use one of the supported backends for running the scripts
#
if {[is_amt_available]} { if {[is_amt_available]} {
spawn_amt $wait_for_re $timeout_value; spawn_amt $wait_for_re $timeout_value
} else { return
spawn_qemu $wait_for_re $timeout_value; }
if {[is_qemu_available]} {
spawn_qemu $wait_for_re $timeout_value
return
} }
} }

21
base-hw/run/env
View File

@ -204,7 +204,26 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
#
# If a running_spawn_id is specified, wait for the expected output
#
if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
}
#
# Try to use one of the supported backends for running the scripts
#
# if {[is_amt_available]} {
# spawn_amt $wait_for_re $timeout_value
# return
# }
# if {[is_qemu_available]} {
# spawn_qemu $wait_for_re $timeout_value
# return
# }
if {[target] == "qemu"} { spawn_qemu $wait_for_re $timeout_value if {[target] == "qemu"} { spawn_qemu $wait_for_re $timeout_value
} else { } else {

10
base-linux/run/env
View File

@ -26,7 +26,15 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
#
# If a running_spawn_id is specified, wait for the expected output
#
if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
}
global output global output
set timeout $timeout_value set timeout $timeout_value
set orig_pwd [pwd] set orig_pwd [pwd]

22
base-nova/run/env
View File

@ -118,10 +118,24 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
#
# If a running_spawn_id is specified, wait for the expected output
#
if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
}
#
# Try to use one of the supported backends for running the scripts
#
if {[is_amt_available]} { if {[is_amt_available]} {
spawn_amt $wait_for_re $timeout_value; spawn_amt $wait_for_re $timeout_value
} else { return
spawn_qemu $wait_for_re $timeout_value; }
if {[is_qemu_available]} {
spawn_qemu $wait_for_re $timeout_value
return
} }
} }

28
base-okl4/run/env
View File

@ -235,10 +235,28 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
if {[is_amt_available]} { #
spawn_amt $wait_for_re $timeout_value; # If a running_spawn_id is specified, wait for the expected output
} else { #
spawn_qemu $wait_for_re $timeout_value; if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
} }
#
# Try to use one of the supported backends for running the scripts
#
if {[is_amt_available]} {
spawn_amt $wait_for_re $timeout_value
return
}
if {[is_qemu_available]} {
spawn_qemu $wait_for_re $timeout_value
return
}
global run_target
puts stderr "Error: Can't execute automatically on target '$run_target'"
exit -1
} }

28
base-pistachio/run/env
View File

@ -151,10 +151,28 @@ proc build_boot_image {binaries} {
} }
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
if {[is_amt_available]} { #
spawn_amt $wait_for_re $timeout_value; # If a running_spawn_id is specified, wait for the expected output
} else { #
spawn_qemu $wait_for_re $timeout_value; if {$running_spawn_id != -1} {
wait_for_output $wait_for_re $timeout_value $running_spawn_id
return
} }
#
# Try to use one of the supported backends for running the scripts
#
if {[is_amt_available]} {
spawn_amt $wait_for_re $timeout_value
return
}
if {[is_qemu_available]} {
spawn_qemu $wait_for_re $timeout_value
return
}
global run_target
puts stderr "Error: Can't execute automatically on target '$run_target'"
exit -1
} }

5
tool/run
View File

@ -111,6 +111,7 @@ proc build_boot_image {binaries} { }
# #
# \param wait_for_re regular expression that matches the test completion # \param wait_for_re regular expression that matches the test completion
# \param timeout_value timeout in seconds # \param timeout_value timeout in seconds
# \param spawn_id spawn_id of a already running and spawned process
# \global output contains the core output (modified) # \global output contains the core output (modified)
# #
# If the function is called without any argument, Genode is executed in # If the function is called without any argument, Genode is executed in
@ -122,7 +123,7 @@ proc build_boot_image {binaries} { }
# This function must be implemented by the platform-specific test environment. # This function must be implemented by the platform-specific test environment.
# If not implemented, the program exits with the error code -3. # If not implemented, the program exits with the error code -3.
# #
proc run_genode_until {{wait_for_re forever} {timeout_value 0}} { proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
puts stderr "Error: 'run_genode_until' is not implemented for this platform" puts stderr "Error: 'run_genode_until' is not implemented for this platform"
exit -3 exit -3
} }
@ -420,7 +421,7 @@ proc wait_for_output { wait_for_re timeout_value running_spawn_id } {
expect { expect {
-i $running_spawn_id -re $wait_for_re { } -i $running_spawn_id -re $wait_for_re { }
eof { puts stderr "Error: Qemu died unexpectedly"; exit -3 } eof { puts stderr "Error: Spawned process died unexpectedly"; exit -3 }
timeout { puts stderr "Error: Test execution timed out"; exit -2 } timeout { puts stderr "Error: Test execution timed out"; exit -2 }
} }
set output $expect_out(buffer) set output $expect_out(buffer)