run: add support to query qemu support

To be used by the base-* specific run/env scripts to choose the appropriate
test backend.
This commit is contained in:
Alexander Boettcher 2013-04-08 10:41:55 +02:00 committed by Norman Feske
parent 0b660eb033
commit 5485fe6f18

View File

@ -418,9 +418,7 @@ proc spawn_qemu { wait_for_re timeout_value } {
# #
# Back out on platforms w/o Qemu support # Back out on platforms w/o Qemu support
# #
if {[have_spec platform_panda] || [have_spec platform_arndale]} { if {![is_qemu_available]} { return 0 }
puts stderr "skipping execution because platform is not supported by qemu"
return 0 }
if {[have_spec x86_32]} { set qemu "qemu-system-i386" } if {[have_spec x86_32]} { set qemu "qemu-system-i386" }
if {[have_spec x86_64]} { set qemu "qemu-system-x86_64" } if {[have_spec x86_64]} { set qemu "qemu-system-x86_64" }
@ -470,6 +468,16 @@ proc spawn_qemu { wait_for_re timeout_value } {
set output $expect_out(buffer) set output $expect_out(buffer)
} }
##
# Check whether Qemu support is available
#
proc is_qemu_available { } {
if {[have_spec platform_panda] || [have_spec platform_arndale]} {
puts stderr "skipping execution because platform is not supported by qemu"
return false
}
return true
}
## ##
# Check whether AMT support is available # Check whether AMT support is available
@ -481,10 +489,10 @@ proc is_amt_available { } {
[info exists ::env(AMT_TEST_MACHINE_PWD)] && [info exists ::env(AMT_TEST_MACHINE_PWD)] &&
[have_installed amtterm] && [have_installed amtterm] &&
[have_installed amttool]} { [have_installed amttool]} {
return true; return true
} }
puts "No support for Intel's AMT detected." puts "No support for Intel's AMT detected."
return false; return false
} }
@ -492,8 +500,9 @@ proc is_amt_available { } {
# Execute scenario using Intel's AMT # Execute scenario using Intel's AMT
# #
proc spawn_amt { wait_for_re timeout_value} { proc spawn_amt { wait_for_re timeout_value} {
if {![is_amt_available]} { global spawn_id
return }
if {![is_amt_available]} { return 0 }
# #
# amttool expects in the environment variable AMT_PASSWORD the password # amttool expects in the environment variable AMT_PASSWORD the password