ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use log_terminal in noux.run script 

This patch changes the noux.run script to use the new log_terminal
component instead of an UART driver. Besides being a nice way to test
the log_terminal service, the new version is much simpler and it just
became compatible to Linux as it no longer relies on an UART driver.

Issue #947
This commit is contained in:
Norman Feske 2013-11-12 17:52:31 +01:00
parent f51c4be5d2
commit 1ed4b9fef9
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ports/run/noux.run
View File

@ -1,9 +1,5 @@
if {[expr [have_spec linux] || [have_spec platform_imx53]]} { build { core init drivers/timer noux/minimal server/log_terminal
puts "\nPlatform not supported because of missing UART driver\n" lib/libc_noux noux-pkg/coreutils }
exit 0
}
build "core init drivers/timer drivers/uart noux/minimal lib/libc_noux noux-pkg/coreutils"
# strip coreutils binaries and create tar archive # strip coreutils binaries and create tar archive
exec sh -c "[cross_dev_prefix]strip bin/coreutils/bin/*" exec sh -c "[cross_dev_prefix]strip bin/coreutils/bin/*"
@ -33,12 +29,10 @@ install_config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="uart_drv"> <start name="terminal">
<binary name="log_terminal" />
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Terminal"/></provides> <provides><service name="Terminal"/></provides>
<config>
<policy label="noux" uart="1"/>
</config>
</start> </start>
<start name="noux"> <start name="noux">
<resource name="RAM" quantum="1G"/> <resource name="RAM" quantum="1G"/>
@ -51,35 +45,19 @@ install_config {
} }
build_boot_image { build_boot_image {
core init timer uart_drv ld.lib.so noux libc.lib.so libm.lib.so core init timer log_terminal ld.lib.so noux libc.lib.so libm.lib.so
libc_noux.lib.so coreutils.tar libc_noux.lib.so coreutils.tar
} }
if {[is_qemu_available]} { append qemu_args " -nographic -serial mon:stdio "
#
# Redirect the output of Noux via the virtual serial port 1 into a file to be
# dumped after the successful completion of the test.
#
set noux_output_file "noux_output.log"
append qemu_args " -nographic" if {[have_spec x86_64]} {
append qemu_args " -serial mon:stdio" # coreutils.tar is really huge when built for x86_64
append qemu_args " -serial file:$noux_output_file" append qemu_args " -m 300 "
if {[have_spec x86_64]} {
# coreutils.tar is really huge when built for x86_64
append qemu_args " -m 300 "
}
} }
run_genode_until "child /bin/ls exited with exit value 0.*\n" 30 run_genode_until "child /bin/ls exited with exit value 0.*\n" 30
if {[is_qemu_available]} {
puts "[exec cat $noux_output_file]"
exec rm $noux_output_file
}
exec rm bin/coreutils.tar exec rm bin/coreutils.tar
puts "Test succeeded" puts "Test succeeded"