From b0271ae5e1ea734a2f7ab9decb090b2a446eb06f Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 26 Sep 2019 09:40:17 +0200 Subject: [PATCH] Fix hard-disk image creation in vfs server tests The hard-disk image must be created before boot-image creation as it is used as boot module by variants of the test (use_ram_block=true). --- .../libports/run/libc_vfs_filesystem_test.inc | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index ee71558a3..a96c485da 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -154,6 +154,19 @@ 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 # @@ -174,19 +187,6 @@ build_boot_image $boot_modules puts "#### boot_modules: $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 } - -set cmd "$mkfs_cmd $mkfs_opts $disk_image" -puts "formating disk: $cmd" -catch { exec sh -c $cmd } - # # Qemu #