diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run
index 8aa9ecceee..ca60e3a377 100644
--- a/repos/libports/run/fatfs_blkio.run
+++ b/repos/libports/run/fatfs_blkio.run
@@ -4,55 +4,21 @@
# \date 2017-07-31
#
-if {[have_board zynq_qemu]} {
- puts "Run script does not support this platform."
+if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
+ puts "Test only runs in Qemu or Linux.\n";
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
-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
-lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_block
-lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_import
+build { test/fatfs_block_io }
-import_from_depot {*}$depot_pkgs
-
-#
-# Generate config
-#
-append config {
+install_config {
@@ -78,45 +44,7 @@ append config {
- }
-
-append_platform_drv_config
-
-append_if $use_ahci config {
-
-
-
-
-
-
-
-
-
- }
-
-append_if $use_sd_card_drv config {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
-append_if $use_vfs_block config {
@@ -130,44 +58,24 @@ append_if $use_vfs_block config {
- }
-
-append config {
+
}
-install_config $config
-
-#
-# Boot modules
-#
-
set disk_image "bin/test.hda"
set cmd "dd if=/dev/zero of=$disk_image bs=512 count=4096"
puts "creating disk image: $cmd"
catch { exec sh -c $cmd }
-# generic modules
-set boot_modules {
+build_boot_image {
libc.lib.so vfs.lib.so
libm.lib.so
+ vfs_import.lib.so
test-fatfs_block_io
+ test.hda
}
-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_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 "
+append qemu_args " -nographic "
run_genode_until {.*child "test-fatfs_block_io" exited with exit value 0.*} 60
diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run
index a8ad25082b..0bdb124524 100644
--- a/repos/libports/run/libc_block.run
+++ b/repos/libports/run/libc_block.run
@@ -1,40 +1,18 @@
-set use_sd_card_drv [expr [have_board pbxa9]]
-set use_ahci_drv [expr [have_spec x86] && ![have_spec 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";
+if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
+ puts "Test only supports Qemu or Linux.\n";
exit 0
}
+create_boot_directory
-#
-# Build
-#
-
-set build_components {
+build {
core init timer
+ server/vfs_block
+ lib/vfs/import
test/libc_block
}
-lappend_if $use_ahci_drv 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 {
+install_config {
@@ -49,7 +27,7 @@ set config {
-
+
@@ -65,43 +43,7 @@ set config {
- }
-
-append_platform_drv_config
-
-append_if $use_ahci_drv config {
-
-
-
-
-
-
-}
-
-append_if $use_sd_card_drv config {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
-append_if $use_vfs_block config {
@@ -115,50 +57,28 @@ append_if $use_vfs_block config {
- }
-
-append config {
+
}
-install_config $config
-
#
# 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 cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536"
puts "creating disk image: $cmd"
catch { exec sh -c $cmd }
-#
-# Qemu
-#
-append qemu_args " -nographic "
-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"
-append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
+# generic modules
+build_boot_image {
+ core init timer
+ ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
+ vfs_block vfs_import.lib.so
+ test-libc_block test.hda
+}
+
+append qemu_args " -nographic "
run_genode_until {.*child "test-libc_block" exited with exit value 0.*} 60
diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc
deleted file mode 100644
index d11676c3ba..0000000000
--- a/repos/libports/run/libc_filesystem_test.inc
+++ /dev/null
@@ -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 {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
-append config "
- "
-append config {
-
-
- }
-append_if [have_include "power_on/qemu"] config {
- }
-append config {
-
-
- }
-append config $libc_dev_blkdev
-append config {
-
-
-
-
- }
-
-append_platform_drv_config
-
-append_if $use_ahci config {
-
-
-
-
-
-
- }
-append_if $use_ahci config "
- "
-append_if $use_ahci config {
-
- }
-
-append_if $use_sd_card_drv config {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
-append_if $use_vfs_block config {
-
-
-
-
-
-
-
-
-
-
-
-
- }
-
-append 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 :
diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc
index 85f2dbbdb4..c683027e16 100644
--- a/repos/libports/run/libc_vfs_filesystem_test.inc
+++ b/repos/libports/run/libc_vfs_filesystem_test.inc
@@ -14,26 +14,11 @@
# \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 } ]} {
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";
+if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
+ puts "Run script does not support this platform."
exit 0
}
@@ -45,22 +30,16 @@ set build_components { test/libc_vfs }
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
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_block depot_pkgs [depot_user]/src/vfs_import
import_from_depot {*}$depot_pkgs
@@ -106,46 +85,8 @@ if {$use_vfs_server} {
append config {
- }
-
-append_platform_drv_config
-
-append_if $use_ahci config {
-
-
-
-
-
-
-
-
-
-
- }
-
-append_if $use_sd_card_drv config {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-append_if $use_vfs_block config {
@@ -181,7 +122,7 @@ append 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"
@@ -199,17 +140,11 @@ catch { exec sh -c $cmd }
# generic 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_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
puts "#### boot_modules: $boot_modules"
@@ -217,9 +152,7 @@ puts "#### boot_modules: $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 "
+append qemu_args " -nographic "
run_genode_until ".*child \"test-libc_vfs\" exited with exit value 0.*" 90