libc_getaddrinfo.run: fix run script

Fixes #3832
This commit is contained in:
Christian Prochaska 2020-07-27 14:57:04 +02:00 committed by Norman Feske
parent 353baa9251
commit 377dadd461

View File

@ -1,24 +1,22 @@
source ${genode_dir}/repos/base/run/platform_drv.inc
if {[have_spec linux]} {
puts "The [run_name] scenario requires QEMU networking."
exit 1
}
set build_components {
core init timer
drivers/nic
lib/vfs/lwip
test/libc_getaddrinfo
}
append_platform_drv_build_components
build $build_components
create_boot_directory
append config {
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_nic_pkg] \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/posix \
[depot_user]/src/vfs \
[depot_user]/src/vfs_lwip \
[depot_user]/src/zlib
build { test/libc_getaddrinfo }
install_config {
<config>
<parent-provides>
<service name="CPU"/>
@ -33,20 +31,22 @@ append config {
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="128"/>}
<default caps="128"/>
append_platform_drv_config
append config {
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="nic_drv" caps="150">
<binary name="} [nic_drv_binary] {"/>
<resource name="RAM" quantum="20M"/>
<provides><service name="Nic"/></provides>
} [nic_drv_config] {
<start name="drivers" caps="1000">
<resource name="RAM" quantum="32M" constrain_phys="yes"/>
<binary name="init"/>
<route>
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service>
</route>
<provides> <service name="Nic"/> </provides>
</start>
<start name="test-libc_getaddrinfo" caps="256">
@ -57,7 +57,7 @@ append config {
<dir name="socket"> <lwip dhcp="yes"/> </dir>
</vfs>
<libc stdout="/dev/log" socket="/socket"/>
<arg value="test-libc_getenv"/>
<arg value="test-libc_getaddrinfo"/>
<arg value="genode.org"/>
<arg value="hypervisor.org"/>
<arg value="example.com"/>
@ -66,23 +66,15 @@ append config {
</config>
}
install_config $config
build_boot_image { test-libc_getaddrinfo }
set boot_modules {
core init ld.lib.so
libc.lib.so libm.lib.so posix.lib.so
vfs_lwip.lib.so
test-libc_getaddrinfo
vfs.lib.so
timer
proc qemu_nic_model {} {
if [have_spec x86] { return e1000 }
if [have_spec lan9118] { return lan9118 }
if [have_spec zynq] { return cadence_gem }
return nic_model_missing
}
# platform-specific modules
append_platform_drv_boot_modules
lappend boot_modules [nic_drv_binary]
build_boot_image $boot_modules
append qemu_args " -nographic -net nic,model=e1000 -net user"
append qemu_args " -nographic -net nic,model=[qemu_nic_model] -net user"
run_genode_until "child .* exited with exit value 0.*\n" 20