filesystem tests: remove block devices/drivers

Fix genodelabs/genode#4490
This commit is contained in:
Stefan Kalkowski 2022-04-27 13:45:53 +02:00 committed by Christian Helmuth
parent 18dcf8af68
commit 6eac4276d5
4 changed files with 40 additions and 491 deletions

View File

@ -4,55 +4,21 @@
# \date 2017-07-31 # \date 2017-07-31
# #
if {[have_board zynq_qemu]} { if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
puts "Run script does not support this platform." puts "Test only runs in Qemu or Linux.\n";
exit 0 exit 0
} }
# use SD on ARM
set use_sd_card_drv [expr [have_board pbxa9]]
# use AHCI on x86
set use_ahci [expr [have_spec x86] && ![have_spec linux]]
# use vfs_block on Linux
set use_vfs_block [have_spec linux]
if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} {
puts "\nPlease setup your native sd or hard drive. Remove this fail stop";
puts "check when you have prepared your native environment.\n";
exit 0
}
#
# Build
#
set build_components {
test/fatfs_block_io
}
lappend_if $use_sd_card_drv build_components drivers/platform
lappend_if $use_sd_card_drv build_components drivers/sd_card/pl180
source ${genode_dir}/repos/base/run/platform_drv.inc
append_platform_drv_build_components
build $build_components
create_boot_directory create_boot_directory
set depot_pkgs "[depot_user]/src/[base_src] [depot_user]/src/init" import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/vfs_block \
[depot_user]/src/vfs_import
lappend_if $use_ahci depot_pkgs [depot_user]/src/ahci_drv build { test/fatfs_block_io }
lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_block
lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_import
import_from_depot {*}$depot_pkgs install_config {
#
# Generate config
#
append config {
<config> <config>
<parent-provides> <parent-provides>
<service name="CPU"/> <service name="CPU"/>
@ -78,45 +44,7 @@ append config {
<libc stdout="/log" stderr="/log"/> <libc stdout="/log" stderr="/log"/>
<vfs> <log/> </vfs> <vfs> <log/> </vfs>
</config> </config>
</start>}
append_platform_drv_config
append_if $use_ahci config {
<start name="ahci_drv">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
<route>
<any-service> <parent /> <any-child /></any-service>
</route>
<config>
<policy label_prefix="test-fatfs_block_io" device="0"/>
</config>
</start>}
append_if $use_sd_card_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Platform"/></provides>
<config>
<device name="pl180" type="arm,pl18x">
<io_mem address="0x10005000" size="0x1000"/>
</device>
<policy label="pl180_sd_card_drv -> ">
<device name="pl180"/>
</policy>
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start> </start>
<start name="pl180_sd_card_drv">
<resource name="RAM" quantum="1M" />
<provides><service name="Block"/></provides>
</start>
}
append_if $use_vfs_block config {
<start name="vfs_block"> <start name="vfs_block">
<resource name="RAM" quantum="4M" /> <resource name="RAM" quantum="4M" />
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
@ -130,44 +58,24 @@ append_if $use_vfs_block config {
<default-policy file="/block_file" block_size="512" <default-policy file="/block_file" block_size="512"
writeable="yes"/> writeable="yes"/>
</config> </config>
</start>} </start>
append config {
</config> </config>
} }
install_config $config
#
# Boot modules
#
set disk_image "bin/test.hda" set disk_image "bin/test.hda"
set cmd "dd if=/dev/zero of=$disk_image bs=512 count=4096" set cmd "dd if=/dev/zero of=$disk_image bs=512 count=4096"
puts "creating disk image: $cmd" puts "creating disk image: $cmd"
catch { exec sh -c $cmd } catch { exec sh -c $cmd }
# generic modules build_boot_image {
set boot_modules {
libc.lib.so vfs.lib.so libc.lib.so vfs.lib.so
libm.lib.so libm.lib.so
vfs_import.lib.so
test-fatfs_block_io test-fatfs_block_io
test.hda
} }
lappend_if $use_sd_card_drv boot_modules platform_drv append qemu_args " -nographic "
lappend_if $use_sd_card_drv boot_modules pl180_sd_card_drv
lappend_if $use_vfs_block boot_modules vfs_import.lib.so
append_platform_drv_boot_modules
build_boot_image $boot_modules
#
# Qemu
#
append qemu_args " -nographic "
append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
run_genode_until {.*child "test-fatfs_block_io" exited with exit value 0.*} 60 run_genode_until {.*child "test-fatfs_block_io" exited with exit value 0.*} 60

View File

@ -1,40 +1,18 @@
set use_sd_card_drv [expr [have_board pbxa9]] if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] puts "Test only supports Qemu or Linux.\n";
set use_vfs_block [have_spec linux]
if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} {
puts "\nPlease setup your native sd or hard drive. Remove this fail stop";
puts "check when you have prepared your native environment.\n";
exit 0 exit 0
} }
create_boot_directory
# build {
# Build
#
set build_components {
core init timer core init timer
server/vfs_block
lib/vfs/import
test/libc_block test/libc_block
} }
lappend_if $use_ahci_drv build_components drivers/ahci install_config {
lappend_if $use_sd_card_drv build_components drivers/platform
lappend_if $use_sd_card_drv build_components drivers/sd_card/pl180
lappend_if $use_vfs_block build_components server/vfs_block
lappend_if $use_vfs_block build_components lib/vfs/import
source ${genode_dir}/repos/base/run/platform_drv.inc
append_platform_drv_build_components
build $build_components
create_boot_directory
#
# Generate config
#
set config {
<config verbose="yes"> <config verbose="yes">
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
@ -49,7 +27,7 @@ set config {
<default-route> <default-route>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</default-route> </default-route>
<default caps="100"/> <default caps="200"/>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides> <provides> <service name="Timer"/> </provides>
@ -65,43 +43,7 @@ set config {
</dir> </dir>
</vfs> </vfs>
</config> </config>
</start>}
append_platform_drv_config
append_if $use_ahci_drv config {
<start name="ahci_drv">
<resource name="RAM" quantum="10M"/>
<provides> <service name="Block"/> </provides>
<config ata="yes">
<policy label_prefix="test-libc_block" device="0"/>
</config>
</start> </start>
}
append_if $use_sd_card_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Platform"/></provides>
<config>
<device name="pl180" type="arm,pl18x">
<io_mem address="0x10005000" size="0x1000"/>
</device>
<policy label="pl180_sd_card_drv -> ">
<device name="pl180"/>
</policy>
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="pl180_sd_card_drv">
<resource name="RAM" quantum="1M" />
<provides><service name="Block"/></provides>
</start>
}
append_if $use_vfs_block config {
<start name="vfs_block"> <start name="vfs_block">
<resource name="RAM" quantum="68M"/> <resource name="RAM" quantum="68M"/>
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
@ -115,50 +57,28 @@ append_if $use_vfs_block config {
<default-policy file="/test.hda" block_size="512" <default-policy file="/test.hda" block_size="512"
writeable="yes"/> writeable="yes"/>
</config> </config>
</start>} </start>
append config {
</config> </config>
} }
install_config $config
# #
# Boot modules # Boot modules
# #
# generic modules
set boot_modules {
core init timer
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
test-libc_block
}
lappend_if $use_ahci_drv boot_modules ahci_drv
lappend_if $use_sd_card_drv boot_modules platform_drv
lappend_if $use_sd_card_drv boot_modules pl180_sd_card_drv
lappend_if $use_vfs_block boot_modules vfs_block
lappend_if $use_vfs_block boot_modules vfs_import.lib.so
append_platform_drv_boot_modules
build_boot_image $boot_modules
#
# Execute test case
#
set disk_image "bin/test.hda" set disk_image "bin/test.hda"
set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536" set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536"
puts "creating disk image: $cmd" puts "creating disk image: $cmd"
catch { exec sh -c $cmd } catch { exec sh -c $cmd }
# # generic modules
# Qemu build_boot_image {
# core init timer
append qemu_args " -nographic " ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
append_if $use_ahci_drv qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d" vfs_block vfs_import.lib.so
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback " test-libc_block test.hda
}
append qemu_args " -nographic "
run_genode_until {.*child "test-libc_block" exited with exit value 0.*} 60 run_genode_until {.*child "test-libc_block" exited with exit value 0.*} 60

View File

@ -1,212 +0,0 @@
#
# \brief Test for using file systems in the libc
# \author Christian Prochaska
# \date 2011-05-27
#
if {[have_board zynq_qemu]} {
puts "Run script does not support this platform."
exit 0
}
if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
puts "Autopilot mode is not supported on this platform."
exit 0
}
# use SD on Qemu/pbxa9
set use_sd_card_drv [expr [have_include "power_on/qemu"] && [have_board pbxa9]]
# use AHCI on x86
set use_ahci [expr [have_spec x86] && ![have_spec linux]]
# use vfs_block on Linux and Qemu/rpi3
set use_vfs_block [expr [have_spec linux] || [expr [have_include "power_on/qemu"] && [have_board rpi3]]]
if {[catch { exec which $mkfs_cmd } ]} {
puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit }
if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} {
puts "\nPlease setup your native sd or hard drive. Remove this fail stop";
puts "check when you have prepared your native environment.\n";
exit 0
}
#
# Build
#
set build_components {
core init timer
test/libc_block
}
lappend build_components test/libc_$filesystem
lappend_if $use_ahci build_components drivers/ahci
lappend_if $use_sd_card_drv build_components drivers/platform
lappend_if $use_sd_card_drv build_components drivers/sd_card/pl180
lappend_if $use_vfs_block build_components server/vfs_block
lappend_if $use_vfs_block build_components lib/vfs/import
source ${genode_dir}/repos/base/run/platform_drv.inc
append_platform_drv_build_components
build $build_components
create_boot_directory
#
# Generate config
#
set config {
<config verbose="yes">
<parent-provides>
<service name="ROM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<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>
</start>}
append config "
<start name=\"test-libc_$filesystem\">"
append config {
<resource name="RAM" quantum="8M"/>
<config>
<iterations value="1"/>}
append_if [have_include "power_on/qemu"] config {
<write-read rounds="2" size="1M" buffer_size="8K"/>}
append config {
<libc stdout="/dev/log" stderr="/dev/log"/>
<vfs>
<dir name="dev">}
append config $libc_dev_blkdev
append config {
<log/>
</dir>
</vfs>
</config>
</start>}
append_platform_drv_config
append_if $use_ahci config {
<start name="ahci_drv">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
<route>
<any-service> <parent /> <any-child /></any-service>
</route>
<config>}
append_if $use_ahci config "
<policy label_prefix=\"test-libc_$filesystem\" device=\"0\" writeable=\"yes\"/>"
append_if $use_ahci config {
</config>
</start>}
append_if $use_sd_card_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Platform"/></provides>
<config>
<device name="pl180" type="arm,pl18x">
<io_mem address="0x10005000" size="0x1000"/>
</device>
<policy label="pl180_sd_card_drv -> ">
<device name="pl180"/>
</policy>
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="pl180_sd_card_drv">
<resource name="RAM" quantum="1M" />
<provides><service name="Block"/></provides>
</start>
}
append_if $use_vfs_block config {
<start name="vfs_block">
<resource name="RAM" quantum="68M"/>
<provides><service name="Block"/></provides>
<config>
<vfs>
<ram/>
<import>
<rom name="test.hda"/>
</import>
</vfs>
<default-policy file="/test.hda" block_size="512"
writeable="yes"/>
</config>
</start>}
append config {
</config>
}
install_config $config
#
# Prepare hard-disk image for test (used by Qemu or in RAM)
#
set disk_image "bin/test.hda"
set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536"
puts "creating disk image: $cmd"
catch { exec sh -c $cmd }
set cmd "$mkfs_cmd $mkfs_opts $disk_image"
puts "formating disk: $cmd"
catch { exec sh -c $cmd }
#
# Boot modules
#
# generic modules
set boot_modules {
core init timer
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
append boot_modules test-libc_$filesystem
append boot_modules " "
append boot_modules libc_$filesystem.lib.so
lappend_if $use_ahci boot_modules ahci_drv
lappend_if $use_sd_card_drv boot_modules platform_drv
lappend_if $use_sd_card_drv boot_modules pl180_sd_card_drv
lappend_if $use_vfs_block boot_modules vfs_block
lappend_if $use_vfs_block boot_modules test.hda
lappend_if $use_vfs_block boot_modules vfs_import.lib.so
append_platform_drv_boot_modules
build_boot_image $boot_modules
#
# Qemu
#
append qemu_args " -nographic "
append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
run_genode_until ".*child \"test-libc_$filesystem\" exited with exit value 0.*" 120
exec rm -f $disk_image
# vi: set ft=tcl :

View File

@ -14,26 +14,11 @@
# \arg test_boot_modules # \arg test_boot_modules
# #
if {[have_board zynq_qemu] || [have_board virt_qemu]} {
puts "Run script does not support this platform."
exit 0
}
# use SD on ARM
set use_sd_card_drv [expr [have_board pbxa9]]
# use AHCI on x86
set use_ahci [expr [have_spec x86] && ![have_spec linux]]
# use vfs_block on Linux
set use_vfs_block [expr [have_spec linux] || [have_board rpi3]]
if {[catch { exec which $mkfs_cmd } ]} { if {[catch { exec which $mkfs_cmd } ]} {
puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit }
if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} { if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "Run script does not support this platform."
puts "check when you have prepared your native environment.\n";
exit 0 exit 0
} }
@ -45,22 +30,16 @@ set build_components { test/libc_vfs }
lappend build_components {*}$test_build_components lappend build_components {*}$test_build_components
lappend_if $use_sd_card_drv build_components drivers/platform
lappend_if $use_sd_card_drv build_components drivers/sd_card/pl180
source ${genode_dir}/repos/base/run/platform_drv.inc
append_platform_drv_build_components
build $build_components build $build_components
create_boot_directory create_boot_directory
set depot_pkgs "[depot_user]/src/[base_src] [depot_user]/src/init" set depot_pkgs " [depot_user]/src/[base_src]
[depot_user]/src/init
[depot_user]/src/vfs_block
[depot_user]/src/vfs_import "
lappend_if $use_ahci depot_pkgs [depot_user]/src/ahci_drv
lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_block
lappend_if $use_vfs_server depot_pkgs [depot_user]/src/vfs lappend_if $use_vfs_server depot_pkgs [depot_user]/src/vfs
lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_import
import_from_depot {*}$depot_pkgs import_from_depot {*}$depot_pkgs
@ -106,46 +85,8 @@ if {$use_vfs_server} {
append config { append config {
</vfs> </vfs>
</config> </config>
</start>}
append_platform_drv_config
append_if $use_ahci config {
<start name="ahci_drv">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
<route>
<any-service> <parent /> <any-child /></any-service>
</route>
<config>
<policy label_prefix="test-libc_vfs" device="0" writeable="yes"/>
<policy label_prefix="vfs" device="0" writeable="yes"/>
</config>
</start>}
append_if $use_sd_card_drv config {
<start name="platform_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Platform"/></provides>
<config>
<device name="pl180" type="arm,pl18x">
<io_mem address="0x10005000" size="0x1000"/>
</device>
<policy label="pl180_sd_card_drv -> ">
<device name="pl180"/>
</policy>
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start> </start>
<start name="pl180_sd_card_drv">
<resource name="RAM" quantum="1M" />
<provides><service name="Block"/></provides>
</start>
}
append_if $use_vfs_block config {
<start name="vfs_block" caps="150"> <start name="vfs_block" caps="150">
<resource name="RAM" quantum="68M" /> <resource name="RAM" quantum="68M" />
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
@ -181,7 +122,7 @@ append config {
install_config $config install_config $config
# #
# Prepare hard-disk image for test (used by Qemu or in RAM) # Prepare hard-disk image for test (used in RAM)
# #
set disk_image "bin/test.hda" set disk_image "bin/test.hda"
@ -199,17 +140,11 @@ catch { exec sh -c $cmd }
# generic modules # generic modules
append boot_modules { append boot_modules {
libc.lib.so vfs.lib.so test-libc_vfs libc.lib.so vfs.lib.so test-libc_vfs test.hda
} }
lappend boot_modules {*}$test_boot_modules lappend boot_modules {*}$test_boot_modules
lappend_if $use_sd_card_drv boot_modules platform_drv
lappend_if $use_sd_card_drv boot_modules pl180_sd_card_drv
lappend_if $use_vfs_block boot_modules test.hda
append_platform_drv_boot_modules
build_boot_image $boot_modules build_boot_image $boot_modules
puts "#### boot_modules: $boot_modules" puts "#### boot_modules: $boot_modules"
@ -217,9 +152,7 @@ puts "#### boot_modules: $boot_modules"
# #
# Qemu # Qemu
# #
append qemu_args " -nographic " append qemu_args " -nographic "
append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
run_genode_until ".*child \"test-libc_vfs\" exited with exit value 0.*" 90 run_genode_until ".*child \"test-libc_vfs\" exited with exit value 0.*" 90