Retire libc_{log, block, fs, rom}

Those plugins are superseded by libc_vfs.

Issue #999
devel
Norman Feske 9 years ago committed by Christian Helmuth
parent 8876dd057d
commit c7f1b85652

@ -1,5 +1,5 @@
#
# \brief Test for using the libc_fs plugin with the Linux file system
# \brief Test for using the libc_vfs plugin with the Linux file system
# \author Norman Feske
# \author Christian Helmuth
# \date 2013-11-07
@ -11,7 +11,7 @@ assert_spec linux
# Build
#
build { core init server/lx_fs test/libc_fs }
build { core init server/lx_fs test/libc_vfs }
create_boot_directory
@ -37,10 +37,18 @@ install_config {
<start name="lx_fs">
<resource name="RAM" quantum="4M"/>
<provides> <service name="File_system"/> </provides>
<config> <policy label="" root="/libc_fs" writeable="yes" /> </config>
<config> <policy label="" root="/libc_vfs" writeable="yes" /> </config>
</start>
<start name="test-libc_fs">
<start name="test-libc_vfs">
<resource name="RAM" quantum="2M"/>
<config>
<libc stdout="/dev/log">
<vfs>
<fs />
<dir name="dev"> <log/> </dir>
</vfs>
</libc>
</config>
</start>
</config>
}
@ -49,17 +57,15 @@ install_config {
# Create test-directory structure
#
exec mkdir -p bin/libc_fs
exec mkdir -p bin/libc_vfs
#
# Boot modules
#
build_boot_image {
core init
ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so
lx_fs test-libc_fs
libc_fs
core init ld.lib.so libc.lib.so lx_fs test-libc_vfs
libc_vfs
}
#
@ -74,6 +80,6 @@ puts "\ntest succeeded\n"
# Cleanup test-directory structure
#
exec rm -r bin/libc_fs
exec rm -r bin/libc_vfs
# vi: set ft=tcl :

@ -44,7 +44,6 @@ append_if [expr {$test_type eq "static"}] config {
<start name="test-lx_rmap_static">}
append_if [expr {$test_type eq "dynamic"}] config {
<start name="test-lx_rmap_dynamic">}
append config {
<resource name="RAM" quantum="8M"/>
</start>
@ -61,9 +60,6 @@ set boot_modules { core init}
lappend_if [expr {$test_type eq "static"}] boot_modules test-lx_rmap_static
lappend_if [expr {$test_type eq "dynamic"}] boot_modules test-lx_rmap_dynamic
lappend_if [expr {$test_type eq "dynamic"}] boot_modules ld.lib.so
lappend_if [expr {$test_type eq "dynamic"}] boot_modules libc.lib.so
lappend_if [expr {$test_type eq "dynamic"}] boot_modules libc_log.lib.so
lappend_if [expr {$test_type eq "dynamic"}] boot_modules libm.lib.so
build_boot_image $boot_modules

@ -5,6 +5,6 @@ endif
TARGET = test-lx_rmap_dynamic
SRC_CC = main.cc
LIBS = base libc
LIBS = base ld
vpath main.cc $(PRG_DIR)/..

@ -63,6 +63,11 @@ set config {
</start>
<start name="test-lwip_httpsrv">
<resource name="RAM" quantum="2M"/>
<config>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>}
append_if [have_spec acpi] config {
@ -112,7 +117,7 @@ install_config $config
set boot_modules {
core init timer
usb_drv
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv
ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv
}
lappend_if [have_spec acpi] boot_modules acpi_drv

@ -12,7 +12,7 @@ set build_components {
drivers/timer
server/ram_blk
server/rump_fs
test/libc_fs
test/libc_vfs
}
build $build_components
@ -60,8 +60,16 @@ append config {
<provides><service name="File_system"/></provides>
<config fs="ext2fs"><policy label="" root="/" writeable="yes"/></config>
</start>
<start name="test-libc_fs">
<start name="test-libc_vfs">
<resource name="RAM" quantum="4M"/>
<config>
<libc stdout="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<fs/>
</vfs>
</libc>
</config>
</start>
</config>}
@ -73,10 +81,9 @@ install_config $config
# generic modules
set boot_modules {
core init timer test-libc_fs ram_blk
core init timer test-libc_vfs ram_blk
rump.lib.so rump_fs.lib.so rump_fs
ld.lib.so ext2.raw libc.lib.so
libc_fs.lib.so libc_log.lib.so
}
build_boot_image $boot_modules

@ -12,7 +12,7 @@ set build_components {
drivers/timer
server/ram_blk
server/rump_fs
test/libc_fs
test/libc_vfs
}
build $build_components
@ -60,8 +60,16 @@ append config {
<provides><service name="File_system"/></provides>
<config fs="msdos"><policy label="" root="/" writeable="yes"/></config>
</start>
<start name="test-libc_fs">
<start name="test-libc_vfs">
<resource name="RAM" quantum="4M"/>
<config>
<libc stdout="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<fs/>
</vfs>
</libc>
</config>
</start>
</config>}
@ -73,10 +81,9 @@ install_config $config
# generic modules
set boot_modules {
core init timer test-libc_fs ram_blk
core init timer test-libc_vfs ram_blk
rump.lib.so rump_fs.lib.so rump_fs
ld.lib.so fs.raw libc.lib.so
libc_fs.lib.so libc_log.lib.so
}
build_boot_image $boot_modules

@ -17,7 +17,6 @@ if {$use_nic_driver} { set network_driver "nic_drv" }
set build_components {
core init
drivers/timer
server/ram_fs
server/nic_bridge
server/http_blk
app/lighttpd
@ -126,36 +125,6 @@ append config {
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="ram_fs">
<resource name="RAM" quantum="15M"/>
<provides><service name="File_system"/></provides>
<config>
<policy label="lighttpd" root="/" />
<content>
<dir name="etc">
<dir name="lighttpd">
<inline name="lighttpd.conf">
# lighttpd configuration
server.port = 80
server.document-root = "/website"
server.event-handler = "select"
server.network-backend = "write"
index-file.names = (
"index.xhtml", "index.html", "index.htm"
)
mimetype.assign = (
".html" => "text/html",
".htm" => "text/html"
)
</inline>
</dir>
</dir>
<dir name="website">
<rom name="index.bin" as="index.bin" />
</dir>
</content>
</config>
</start>
<start name="http_blk">
<resource name="RAM" quantum="2M" />
<provides><service name="Block"/></provides>
@ -178,7 +147,36 @@ mimetype.assign = (
<arg value="-f" />
<arg value="/etc/lighttpd/lighttpd.conf" />
<arg value="-D" />
<libc ip_addr="10.0.1.1" gateway="10.0.1.5" netmask="255.255.255.0"/>
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"
ip_addr="10.0.1.1" gateway="10.0.1.5" netmask="255.255.255.0">
<vfs>
<dir name="dev">
<log/>
<null/>
</dir>
<dir name="etc">
<dir name="lighttpd">
<inline name="lighttpd.conf">
# lighttpd configuration
server.port = 80
server.document-root = "/website"
server.event-handler = "select"
server.network-backend = "write"
index-file.names = (
"index.xhtml", "index.html", "index.htm"
)
mimetype.assign = (
".html" => "text/html",
".htm" => "text/html"
)
</inline>
</dir>
</dir>
<dir name="website">
<rom name="index.bin" as="index.bin" />
</dir>
</vfs>
</libc>
</config>
<route>
<service name="Nic"> <child name="nic_bridge"/> </service>
@ -197,8 +195,8 @@ catch { exec dd if=/dev/zero of=bin/index.bin bs=512 count=400 }
# generic modules
set boot_modules {
core init timer ld.lib.so ram_fs
libc.lib.so libm.lib.so libc_fs.lib.so libc_log.lib.so
core init timer ld.lib.so
libc.lib.so libm.lib.so
lwip.lib.so zlib.lib.so
lighttpd nic_bridge http_blk index.bin test-rom_blk
}
@ -221,4 +219,4 @@ append qemu_args " -net user -redir tcp:5555::80 "
append qemu_args " -nographic -serial mon:stdio "
run_genode_until {.*all done, finished!.*} 120
exec rm -f bin/index.bin
exec rm -f bin/index.bin

@ -59,6 +59,9 @@ set config {
<provides> <service name="Terminal"/> </provides>
<config>
<policy label="test-terminal_echo" port="8888"/>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</lib>
</config>
</start>
<start name="test-terminal_echo">
@ -85,7 +88,7 @@ install_config $config
set boot_modules {
core init timer
nic_drv
ld.lib.so libc.lib.so lwip.lib.so libc_log.lib.so libc_lock_pipe.lib.so
ld.lib.so libc.lib.so lwip.lib.so libc_lock_pipe.lib.so
tcp_terminal
test-terminal_echo
}

@ -1,9 +1,15 @@
File terminal is a service that provides Genode's Terminal_session interface
for a given file via a File_system_session.
File terminal is a service that provides a terminal-session interface and
redirects the terminal input and output to a file.
! <config>
! <policy label="client1" filename="test.txt" />
! <policy label="client2" filename="file.dat" io_buffer_size="4K"/>h
! <libc stdout="/dev/log">
! <vfs>
! <dir name="dev"> <log/> </dir>
! <fs/>
! </vfs>
! </libc>
! </config>
To keep things simple a client can only open one file at the moment.
To keep things simple, a client can only open one file at the moment.

@ -1,3 +1,3 @@
TARGET = file_terminal
SRC_CC = main.cc
LIBS = libc libc_fs libc_log
LIBS = libc libc_vfs

@ -1,3 +1,3 @@
TARGET = tcp_terminal
SRC_CC = main.cc
LIBS = libc libc_lwip_nic_dhcp libc_log libc_lock_pipe
LIBS = libc libc_lwip_nic_dhcp libc_vfs libc_lock_pipe

@ -1,7 +0,0 @@
LIBS = libc
SRC_CC = plugin.cc
vpath %.cc $(REP_DIR)/src/lib/libc_block
SHARED_LIB = yes

@ -1,7 +0,0 @@
SRC_CC = plugin.cc
LIBS += libc
INC_DIR += $(REP_DIR)/src/lib/libc
vpath plugin.cc $(REP_DIR)/src/lib/libc_fs
SHARED_LIB = yes

@ -4,7 +4,7 @@ EXFAT_DIR = $(REP_DIR)/contrib/$(EXFAT)
SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c)
SRC_CC = init.cc
LIBS = libc libc_block libc_fuse libfuse libexfat
LIBS = libc libc_vfs libc_fuse libfuse libexfat
vpath %.c $(EXFAT_DIR)/fuse
vpath %.cc $(REP_DIR)/src/lib/exfat

@ -5,7 +5,7 @@ FILTER_OUT = fuse-ext2.probe.c fuse-ext2.wait.c
SRC_C = $(filter-out $(FILTER_OUT), $(notdir $(wildcard $(FUSE_EXT2_DIR)/*.c)))
SRC_CC = init.cc
LIBS = libc libc_block libc_fuse libfuse libext2fs
LIBS = libc libc_vfs libc_fuse libfuse libext2fs
CC_OPT = -DHAVE_CONFIG_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64

@ -4,7 +4,7 @@ NTFS_3G_DIR = $(REP_DIR)/contrib/$(NTFS_3G)
SRC_C = ntfs-3g.c ntfs-3g_common.c
SRC_CC = init.cc
LIBS = libc libc_block libc_fuse libfuse libntfs-3g
LIBS = libc libc_vfs libc_fuse libfuse libntfs-3g
CC_OPT = -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED

@ -1,6 +0,0 @@
SRC_CC = plugin.cc
LIBS += libc
vpath plugin.cc $(REP_DIR)/src/lib/libc_log
SHARED_LIB = yes

@ -1,6 +0,0 @@
SRC_CC = plugin.cc
LIBS += libc
vpath plugin.cc $(REP_DIR)/src/lib/libc_rom
SHARED_LIB = yes

@ -95,7 +95,7 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="oss_drv">
<start name="audio_out_drv">
<resource name="RAM" quantum="6M"/>
<route>
<any-service> <any-child /> <parent /></any-service>
@ -108,7 +108,7 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Audio_out"/></provides>
<route>
<service name="Audio_out"> <child name="oss_drv"/> </service>
<service name="Audio_out"> <child name="audio_out_drv"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
@ -118,6 +118,12 @@ append config {
<arg value="avplay"/>
<arg value="mediafile"/>
<sdl_audio_volume value="100"/>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<rom name="mediafile"/>
</vfs>
</libc>
</config>
<route>
<service name="PCI"> <any-child /> </service>
@ -135,8 +141,8 @@ install_config $config
#
set boot_modules {
core init timer oss_drv mixer avplay
ld.lib.so libc.lib.so libc_log.lib.so libc_rom.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so
core init timer audio_out_drv mixer avplay
ld.lib.so libc.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so
avfilter.lib.so avutil.lib.so avcodec.lib.so avformat.lib.so swscale.lib.so
mediafile
}

@ -97,6 +97,11 @@ append config {
<start name="eglgears">
<resource name="RAM" quantum="1G"/>
<route><any-service> <parent /> <any-child/> </any-service></route>
<config>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>
</launcher>
@ -110,7 +115,7 @@ install_config $config
set boot_modules {
core init ld.lib.so timer nitpicker nit_fb
launchpad eglgears
gallium.lib.so libc.lib.so libm.lib.so libc_log.lib.so pthread.lib.so
gallium.lib.so libc.lib.so libm.lib.so pthread.lib.so
}
lappend_if [have_spec linux] boot_modules fb_sdl

@ -40,7 +40,15 @@ install_config {
<start name="test-expat">
<resource name="RAM" quantum="2M"/>
<config>
<test_tag test_attribute="test_value" />
<libc stdout="/dev/log">
<vfs>
<inline name="config"><config>
<test_tag test_attribute="test_value" />
</config>
</inline>
<dir name="dev"> <log/> </dir>
</vfs>
</libc>
</config>
</start>
</config>
@ -52,7 +60,7 @@ install_config {
build_boot_image {
core init timer
ld.lib.so libc.lib.so libc_log.lib.so libc_rom.lib.so expat.lib.so
ld.lib.so libc.lib.so expat.lib.so
test-expat
}

@ -30,7 +30,7 @@ requires_installation_of lynx
build {
core init
drivers/pci drivers/timer drivers/nic
drivers/acpi drivers/pci drivers/timer drivers/nic
test/lwip/http_srv_tracing
}
@ -59,7 +59,7 @@ set config {
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="timer">
<resource name="RAM" quantum="568K"/>
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="nic_drv">
@ -68,13 +68,32 @@ set config {
</start>
<start name="test-lwip_httpsrv_tracing">
<resource name="RAM" quantum="64M"/>
</start> }
append_if [have_spec pci] config {
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>}
append_if [have_spec acpi] config {
<start name="acpi">
<resource name="RAM" quantum="6M"/>
<binary name="acpi_drv"/>
<provides>
<service name="PCI"/>
<service name="IRQ" />
</provides>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>}
append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="1M"/>
<resource name="RAM" quantum="3M"/>
<provides> <service name="PCI"/> </provides>
</start> }
</start>}
append config {
</config>
@ -90,12 +109,13 @@ install_config $config
set boot_modules {
core init timer
nic_drv
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so
ld.lib.so libc.lib.so lwip.lib.so
test-lwip_httpsrv_tracing
}
# platform-specific modules
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec acpi] boot_modules acpi_drv
build_boot_image $boot_modules

@ -75,7 +75,7 @@ set boot_modules {
usb_drv
gpio_drv
test-lwip_httpsrv_tracing_nob
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so
ld.lib.so libc.lib.so lwip.lib.so
}
build_boot_image [join $boot_modules " "]

@ -60,6 +60,11 @@ set config {
<start name="test-lwip_httpsrv_tracing">
<resource name="RAM" quantum="64M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>}
@ -75,7 +80,7 @@ set boot_modules {
usb_drv
gpio_drv
test-lwip_httpsrv_tracing
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so
ld.lib.so libc.lib.so lwip.lib.so
}
build_boot_image [join $boot_modules " "]

@ -20,14 +20,19 @@ install_config {
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="test-libc">
<resource name="RAM" quantum="1M"/>
<resource name="RAM" quantum="4M"/>
<config>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>
}
build_boot_image {
core init test-libc
ld.lib.so libc.lib.so libc_log.lib.so libm.lib.so
ld.lib.so libc.lib.so libm.lib.so
}
append qemu_args " -nographic -m 64 "

@ -76,6 +76,14 @@ set config {
<start name="test-libc_block">
<resource name="RAM" quantum="2M"/>
<config>
<libc stdout="/dev/log">
<vfs>
<dir name="dev">
<log/>
<block name="blkdev"/>
</dir>
</vfs>
</libc>
</config>
</start>
}
@ -128,7 +136,7 @@ install_config $config
# generic modules
set boot_modules {
core init timer
ld.lib.so libc.lib.so libc_log.lib.so libc_block.lib.so
ld.lib.so libc.lib.so
test-libc_block
}

@ -2,4 +2,11 @@ set mkfs_cmd mkfs.vfat
set mkfs_opts "-F32"
set filesystem ffat
#
# The ffat_libc plugin opens a block session directly. If the VFS opened
# the block session, the plugin would try to open a second one, which
# would get denied by the block driver.
#
set libc_dev_blkdev ""
source ${genode_dir}/libports/run/libc_filesystem_test.inc

@ -1,5 +1,5 @@
#
# \brief Test for using the libc_fs plugin with the FFAT file system
# \brief Test for using the libc_vfs plugin with the FFAT file system
# \author Christian Prochaska
# \date 2012-07-03
#
@ -21,7 +21,7 @@ set build_components {
core init
drivers/timer
server/ffat_fs
test/libc_fs
test/libc_vfs
}
lappend_if [have_spec pci] build_components drivers/pci
@ -63,8 +63,16 @@ set config {
<provides> <service name="File_system"/> </provides>
<config> <policy label="" root="/" writeable="yes" /> </config>
</start>
<start name="test-libc_fs">
<start name="test-libc_vfs">
<resource name="RAM" quantum="2M"/>
<config>
<libc stdout="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<fs/>
</vfs>
</libc>
</config>
</start>
}
@ -116,8 +124,8 @@ install_config $config
# generic modules
set boot_modules {
core init timer ffat_fs
ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so
test-libc_fs
ld.lib.so libc.lib.so
test-libc_vfs
}
lappend_if [have_spec pci] boot_modules pci_drv

@ -105,9 +105,17 @@ append config {
<resource name="RAM" quantum="8M"/>
<config>
<iterations value="1"/>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs>
<dir name="dev">}
append config $libc_dev_blkdev
append config {
<log/>
</dir>
</vfs>
</libc>
</config>
</start>
}
</start>}
append_if [have_spec acpi] config {
<start name="acpi">
@ -171,7 +179,7 @@ install_config $config
# generic modules
set boot_modules {
core init timer
ld.lib.so libc.lib.so libc_log.lib.so libc_block.lib.so
ld.lib.so libc.lib.so
}
append boot_modules test-libc_$filesystem

@ -1,67 +0,0 @@
#
# \brief Test for using the libc_fs plugin with the RAM file system
# \author Norman Feske
# \date 2012-04-11
#
#
# Build
#
build { core init server/ram_fs test/libc_fs }
create_boot_directory
#
# Generate config
#
install_config {
<config>
<parent-provides>
<service name="ROM"/>
<service name="RAM"/>
<service name="CAP"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="SIGNAL"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="ram_fs">
<resource name="RAM" quantum="4M"/>
<provides> <service name="File_system"/> </provides>
<config> <policy label="" root="/" writeable="yes" /> </config>
</start>
<start name="test-libc_fs">
<resource name="RAM" quantum="2M"/>
<config>
<iterations value="1"/>
</config>
</start>
</config>
}
#
# Boot modules
#
build_boot_image {
core init
ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so
ram_fs test-libc_fs
}
#
# Execute test case
#
append qemu_args " -m 128 -nographic "
run_genode_until {.*child exited with exit value 0.*} 60
puts "\ntest succeeded\n"
# vi: set ft=tcl :

@ -1,5 +1,5 @@
#
# \brief Test for using the libc_fs plugin with the TAR file system
# \brief Test for using the libc_vfs plugin with the TAR file system
# \author Christian Prochaska
# \date 2012-08-20
#
@ -53,6 +53,14 @@ set config {
</start>
<start name="test-libc_fs_tar_fs">
<resource name="RAM" quantum="2M"/>
<config>
<libc stdout="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<fs/>
</vfs>
</libc>
</config>
</start>
}
@ -82,7 +90,7 @@ exec tar cfv bin/libc_fs_tar_fs.tar -C bin/libc_fs_tar_fs .
# generic modules
set boot_modules {
core init timer tar_fs
ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so
ld.lib.so libc.lib.so
test-libc_fs_tar_fs libc_fs_tar_fs.tar
}

@ -1,5 +1,6 @@
set mkfs_cmd mkfs.exfat
set mkfs_opts ""
set filesystem fuse_exfat
set mkfs_cmd mkfs.exfat
set mkfs_opts ""
set filesystem fuse_exfat
set libc_dev_blkdev {<block name="blkdev"/>}
source ${genode_dir}/libports/run/libc_filesystem_test.inc

@ -1,5 +1,6 @@
set mkfs_cmd mkfs.ext2
set mkfs_opts "-F"
set filesystem fuse_ext2
set mkfs_cmd mkfs.ext2
set mkfs_opts "-F"
set filesystem fuse_ext2
set libc_dev_blkdev {<block name="blkdev"/>}
source ${genode_dir}/libports/run/libc_filesystem_test.inc

@ -40,11 +40,12 @@ install_config {
<resource name="RAM" quantum="2M"/>
<config>
<iterations value="1"/>
<libc cwd="/tmp" >
<libc stdout="/dev/log" cwd="/tmp" >
<vfs>
<dir name="tmp" >
<fs/>
</dir>
<dir name="dev"> <log/> </dir>
</vfs>
</libc>
</config>
@ -58,7 +59,7 @@ install_config {
build_boot_image {
core init
ld.lib.so libc.lib.so libc_log.lib.so
ld.lib.so libc.lib.so
ram_fs test-libc_vfs
}

@ -75,7 +75,12 @@ set config {
</start>
<start name="test-lwip_httpsrv">
<resource name="RAM" quantum="5M"/>
</start> }
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>}
append_if [have_spec platform_arndale] config {
<start name="platform_drv">
@ -125,7 +130,7 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config {
<start name="pci_drv">
<resource name="RAM" quantum="3M"/>
<provides> <service name="PCI"/> </provides>
</start> }
</start>}
append config {
</config>
@ -140,7 +145,7 @@ install_config $config
# generic modules
set boot_modules {
core init timer
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv
ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv
}
# platform-specific modules

@ -42,6 +42,11 @@ set config {
</start>
<start name="test-lwip_httpsrv">
<resource name="RAM" quantum="5M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>
}
@ -54,7 +59,7 @@ install_config $config
set boot_modules {
core init timer nic_drv
ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv
ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv
}
build_boot_image $boot_modules

@ -28,13 +28,18 @@ install_config {
</start>
<start name="test-moon">
<resource name="RAM" quantum="1G"/>
<config>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>
}
build_boot_image {
core init timer test-moon
ld.lib.so libc.lib.so libc_log.lib.so libm.lib.so
ld.lib.so libc.lib.so libm.lib.so
}
append qemu_args " -nographic -m 64 "

@ -61,6 +61,14 @@ append config {
</start>
<start name="mupdf">
<resource name="RAM" quantum="1G"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs>
<rom name="test.pdf" />
<dir name="dev"> <log/> </dir>
</vfs>
</libc>
</config>
</start>
</config>
}
@ -83,7 +91,7 @@ if {![file exist bin/test.pdf]} {
set boot_modules {
core init ld.lib.so timer
mupdf
libc.lib.so libm.lib.so libc_log.lib.so libc_rom.lib.so
libc.lib.so libm.lib.so
openjpeg.lib.so freetype.lib.so libpng.lib.so zlib.lib.so jbig2dec.lib.so
mupdf.lib.so jpeg.lib.so
test.pdf

@ -81,6 +81,9 @@ append config {
<resource name="RAM" quantum="16M"/>
<config>
<argv verbose="0" listenip="0.0.0.0" />
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
<route> }
append_if $use_nic_bridge config {
@ -147,7 +150,7 @@ install_config $config
# generic modules
set boot_modules {
core init timer
ld.lib.so libc.lib.so lwip.lib.so libc_log.lib.so
ld.lib.so libc.lib.so lwip.lib.so
}
lappend_if $use_nic_bridge boot_modules nic_bridge

@ -21,13 +21,18 @@ install_config {
</default-route>
<start name="test-pthread">
<resource name="RAM" quantum="2M"/>
<config>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>
}
build_boot_image {
core init test-pthread
ld.lib.so libc.lib.so libc_log.lib.so pthread.lib.so
ld.lib.so libc.lib.so pthread.lib.so
}
append qemu_args " -nographic -m 64 "

@ -41,6 +41,24 @@ set config {
<resource name="RAM" quantum="3M"/>
<config>
<script name="hello.py"/>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<inline name="hello.py">
print " \r\n\r";
print " -============================-";
print " || ||";
print " || Python Core 2.6.4 ||";
print " || ||";
print " || Genode 11.11 ||";
print " || ||";
print " -============================-";
print " \r";
print " 2011 by Genode Labs <www.genode-labs.com>";
print " \r\n\r";
</inline>
</vfs>
</libc>
</config>
</start>
</config>
@ -52,29 +70,11 @@ install_config $config
# Boot modules
#
# Fill up hello.py with zeros, otherwise on OKL4 it fails on native machines.
# OKL4 bootstrap procedure loads the script to the designated address but does
# not clear the remainder of the page. Hence, the script is followed by some
# garbage, which the interpreter tries to execute.
set test_file "[genode_dir]/libports/src/test/python/hello.py"
set file_size [exec du -b $test_file]
set file_size [regexp -inline {[0-9]+} $file_size]
set file_size [expr 4096 - $file_size]
catch { exec dd if=/dev/zero of=bin/hello.py.tmp bs=1 count=$file_size}
exec cp $test_file bin/hello.py
exec cat bin/hello.py.tmp >>bin/hello.py
exec rm bin/hello.py.tmp
set file_size [exec du -b bin/hello.py]
set file_size [regexp -inline {[0-9]+} $file_size]
if {$file_size != 4096 } { puts "hello.py could not be prepared properly"; exit 1 }
# generic modules
set boot_modules {
core init
ld.lib.so libc.lib.so libc_log.lib.so libc_rom.lib.so libm.lib.so python.lib.so
ld.lib.so libc.lib.so libm.lib.so python.lib.so
test-python
hello.py
}
build_boot_image $boot_modules
@ -102,6 +102,4 @@ compare_output_to {
[init -> test-python]
}
exec rm bin/hello.py
# vi: set ft=tcl :

@ -103,7 +103,6 @@ set boot_modules {
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so

@ -120,7 +120,6 @@ set boot_modules {
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so
@ -140,8 +139,6 @@ set boot_modules {
swscale.lib.so
sdl.lib.so
pthread.lib.so
libc_log.lib.so
libc_rom.lib.so
avplay
mediafile
stdcxx.lib.so

@ -100,7 +100,6 @@ set boot_modules {
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so

@ -10,7 +10,6 @@ build {
drivers/framebuffer
drivers/timer
server/nitpicker
server/liquid_framebuffer
app/qt5/examples/openglwindow
}
@ -77,6 +76,11 @@ append config {
</start>
<start name="openglwindow">
<resource name="RAM" quantum="80M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</start>
</config>
}
@ -93,14 +97,12 @@ set boot_modules {
init
timer
nitpicker
liquid_fb
openglwindow
freetype.lib.so
gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so

@ -100,7 +100,6 @@ set boot_modules {
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so

@ -10,7 +10,6 @@ build {
drivers/framebuffer
drivers/timer
server/nitpicker
server/liquid_framebuffer
server/loader
server/tar_rom
test/nitpicker
@ -102,7 +101,6 @@ set boot_modules {
init
timer
nitpicker
liquid_fb
loader
tar_rom
testnit
@ -112,7 +110,6 @@ set boot_modules {
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libcrypto.lib.so
libm.lib.so

@ -10,8 +10,6 @@ build {
drivers/framebuffer
drivers/timer
server/nitpicker
server/liquid_framebuffer
server/tar_fs
app/qt5/qt_quicktest
lib/qt5/qtdeclarative/src/imports/qtquick2
}
@ -83,16 +81,16 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides>
</start>
<start name="tar_fs">
<resource name="RAM" quantum="4M"/>
<provides> <service name="File_system"/> </provides>
<config>
<archive name="qt5_fs.tar" />
<policy label="" root="/" />
</config>
</start>
<start name="qt_quicktest">
<resource name="RAM" quantum="80M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<tar name="qt5_fs.tar" />
</vfs>
</libc>
</config>
</start>
</config>
}
@ -113,16 +111,12 @@ set boot_modules {
init
timer
nitpicker
liquid_fb
tar_fs
qt_quicktest
freetype.lib.so
gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
libc_fs.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libcrypto.lib.so
libm.lib.so

@ -10,8 +10,6 @@ build {
drivers/framebuffer
drivers/timer
server/nitpicker
server/liquid_framebuffer
server/tar_fs
app/qt5/examples/samegame
lib/qt5/qtdeclarative/src/imports/qtquick2
}
@ -83,16 +81,16 @@ append config {
<resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides>
</start>
<start name="tar_fs">
<resource name="RAM" quantum="4M"/>
<provides> <service name="File_system"/> </provides>
<config>
<archive name="qt5_fs.tar" />
<policy label="" root="/" />
</config>
</start>
<start name="samegame">
<resource name="RAM" quantum="128M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs>
<dir name="dev"> <log/> </dir>
<tar name="qt5_fs.tar" />
</vfs>
</libc>
</config>
</start>
</config>
}
@ -113,16 +111,12 @@ set boot_modules {
init
timer
nitpicker
liquid_fb
tar_fs
samegame
freetype.lib.so
gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
libc_fs.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libcrypto.lib.so
libm.lib.so

@ -10,7 +10,6 @@ build {
drivers/framebuffer
drivers/timer
server/nitpicker
server/liquid_framebuffer
app/qt5/examples/tetrix
}
@ -93,14 +92,12 @@ set boot_modules {
init
timer
nitpicker
liquid_fb
tetrix
freetype.lib.so
gallium.lib.so
icu.lib.so
ld.lib.so
libc.lib.so
libc_log.lib.so
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so

@ -135,12 +135,20 @@ append config {
</start>
<start name="textedit">
<resource name="RAM" quantum="70M"/>
<config xpos="3" ypos="0" width="500" height="710"/>
<config xpos="3" ypos="0" width="500" height="710">
<libc>
<vfs> <fs/> </vfs>
</libc>
</config>
</start>
<start name="textedit2">
<binary name="textedit" />
<resource name="RAM" quantum="70M"/>
<config xpos="512" ypos="0" width="500" height="710"/>
<config xpos="512" ypos="0" width="500" height="710">
<libc>
<vfs> <fs/> </vfs>
</libc>
</config>