dde_rump: fix rump_iso test

The run script did not consider the routing for the environment ROM
sessions for the test-iso component. It routed all ROM sessions -
including the ones for the executable and the dynamic linker - to
fs_rom. The patch also adds the cap quota definitions required since
version 17.05 and fixes a whitespace inconsistency between the test
program and the run script.

Thanks to Steven Harp for reporting!
This commit is contained in:
Norman Feske 2017-07-26 08:41:46 +02:00 committed by Christian Helmuth
parent 1f679cdffe
commit e31806d4e6
2 changed files with 4 additions and 6 deletions

View File

@ -7,7 +7,6 @@ if {[have_spec arm]} {
#
set mkisofs [check_installed mkisofs]
#
#
# Build
#
@ -41,6 +40,7 @@ append config {
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
@ -50,7 +50,7 @@ append config {
<provides><service name="Block"/></provides>
<config file="fs.iso" block_size="2048"/>
</start>
<start name="rump_fs">
<start name="rump_fs" caps="200">
<resource name="RAM" quantum="8M" />
<provides><service name="File_system"/></provides>
<config fs="cd9660"><policy label_prefix="fs_rom" root="/" writeable="no"/></config>
@ -61,8 +61,9 @@ append config {
</start>
<start name="test-iso">
<resource name="RAM" quantum="1M" />
<config/>
<route>
<service name="ROM"><child name="fs_rom"/></service>
<service name="ROM" label_prefix=""><child name="fs_rom"/></service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>
@ -92,7 +93,6 @@ set boot_modules {
fs.iso fs_rom
}
build_boot_image $boot_modules
append qemu_args "-nographic "

View File

@ -42,8 +42,6 @@ struct Hexdump
off += j * sizeof(unsigned long);
print(out, "\n");
}
print(out, "\n");
}
};