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).
This commit is contained in:
Christian Helmuth 2019-09-26 09:40:17 +02:00
parent 6a063364da
commit b0271ae5e1

View File

@ -154,6 +154,19 @@ append config {
install_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 # Boot modules
# #
@ -174,19 +187,6 @@ build_boot_image $boot_modules
puts "#### boot_modules: $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 # Qemu
# #