vbox5: add log_core to test scripts

Issue #2207
This commit is contained in:
Alexander Boettcher 2018-05-31 11:19:31 +02:00 committed by Christian Helmuth
parent 70028f8445
commit fd7357d9d5

View File

@ -23,6 +23,10 @@ if { [get_cmd_switch --autopilot] && [have_spec x86_32] } {
exit 0 exit 0
} }
if {[have_spec nova]} {
proc kernel_output { } { return "novga logmem" }
}
append build_components { append build_components {
core init core init
server/part_blk server/part_blk
@ -43,6 +47,7 @@ lappend_if [expr $use_ram_fs || $use_usb] build_components server/ram_fs
lappend_if [expr $use_cpu_load] build_components app/trace_subject_reporter lappend_if [expr $use_cpu_load] build_components app/trace_subject_reporter
lappend_if [expr $use_cpu_load] build_components app/cpu_load_display lappend_if [expr $use_cpu_load] build_components app/cpu_load_display
lappend_if [expr $use_cpu_load] build_components app/top lappend_if [expr $use_cpu_load] build_components app/top
lappend_if [have_spec nova] build_components app/log_core
source ${genode_dir}/repos/base/run/platform_drv.inc source ${genode_dir}/repos/base/run/platform_drv.inc
# override defaults of platform_drv.inc # override defaults of platform_drv.inc
@ -112,6 +117,22 @@ append config {
</config> </config>
</start>} </start>}
append_if [have_spec nova] config {
<start name="log_kernel">
<binary name="log_core"/>
<resource name="RAM" quantum="10M"/>
<config period_ms="2000"/>
<route>
<service name="ROM" unscoped_label="log_core"> <parent/> </service>
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
<service name="ROM" label="log"> <parent label="kernel_log"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="PD"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service>
</route>
</start>}
append_if [expr $use_rumpfs] config { append_if [expr $use_rumpfs] config {
<start name="rump_fs" priority="-1" caps="200"> <start name="rump_fs" priority="-1" caps="200">
<resource name="RAM" quantum="32M"/> <resource name="RAM" quantum="32M"/>
@ -359,9 +380,10 @@ lappend_if [expr $use_vbox4] boot_modules $virtualbox_binary
lappend_if [expr $use_vbox5] boot_modules $virtualbox5_binary lappend_if [expr $use_vbox5] boot_modules $virtualbox5_binary
lappend_if [expr $use_ram_fs || $use_usb] boot_modules ram_fs lappend_if [expr $use_ram_fs || $use_usb] boot_modules ram_fs
lappend_if [expr $use_ram_fs && !$use_overlay_from_disk] boot_modules $overlay_image lappend_if [expr $use_ram_fs && !$use_overlay_from_disk] boot_modules $overlay_image
lappend_if [expr $use_cpu_load] boot_modules trace_subject_reporter lappend_if [expr $use_cpu_load] boot_modules trace_subject_reporter
lappend_if [expr $use_cpu_load] boot_modules cpu_load_display lappend_if [expr $use_cpu_load] boot_modules cpu_load_display
lappend_if [expr $use_cpu_load] boot_modules top lappend_if [expr $use_cpu_load] boot_modules top
lappend_if [have_spec nova] boot_modules log_core
# platform-specific modules # platform-specific modules
lappend_if [expr $use_ps2] boot_modules ps2_drv lappend_if [expr $use_ps2] boot_modules ps2_drv