hw: re-enable kernel tests with the new run env

The new run env doesn't pass the "core_type" parameter at one point
which is why we have to pass it through a global HW-specific variable.

Ref #1464
This commit is contained in:
Martin Stein 2015-03-20 12:30:18 +01:00 committed by Christian Helmuth
parent 7a8c088fc6
commit de9d69a6d7
4 changed files with 12 additions and 11 deletions

View File

@ -11,7 +11,8 @@ build "test/cpu_scheduler"
create_boot_directory
# create single boot image from the compiled program images
build_boot_image "test-cpu_scheduler" test
set core_test 1
build_boot_image "test-cpu_scheduler"
# configure qemu to use 64 MB RAM and avoid GUI mode
append qemu_args " -m 64 -nographic"

View File

@ -11,7 +11,8 @@ build "test/double_list"
create_boot_directory
# create single boot image from the compiled program images
build_boot_image "test-double_list" test
set core_test 1
build_boot_image "test-double_list"
# configure qemu to use 64 MB RAM and avoid GUI mode
append qemu_args " -m 64 -nographic"

View File

@ -11,7 +11,8 @@ build "test/hw_info"
create_boot_directory
# create single boot image from the compiled program images
build_boot_image "test-hw_info" test
set core_test 1
build_boot_image "test-hw_info"
# configure qemu to use 64 MB RAM and avoid GUI mode
append qemu_args " -m 64 -nographic"

View File

@ -18,20 +18,18 @@ proc run_boot_string { } {
##
# Populate boot directory with binaries on hw
#
proc run_boot_dir {binaries {core_type core}} {
if {$core_type == "test"} {
proc run_boot_dir {binaries} {
# adapt to wether this is a core-internal test or a common scenario
global core_test
if {[info exists core_test]} {
set core_bin "test-[run_name]"
set core_target "test/[run_name]"
} elseif {$core_type == "core"} {
} else {
set core_bin "core"
set core_target "core"
} else {
puts stderr "Error: Unknown core type '$core_type'"
exit -1
}
global run_target
# strip binaries
copy_and_strip_genode_binaries_to_run_dir $binaries