From c055986e38e1447746cfdd465148a1e9bfa2ce7d Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 22 May 2019 10:32:44 +0200 Subject: [PATCH] vbox5*.run: enable VM tests for Fiasco.OC Issue #3111 --- repos/ports/run/vbox5_ubuntu_14_04_32.run | 3 + repos/ports/run/vbox5_ubuntu_14_04_64.run | 3 +- repos/ports/run/vbox5_ubuntu_16_04_32.run | 3 + repos/ports/run/vbox5_ubuntu_16_04_64.run | 3 +- repos/ports/run/vbox5_vm_ubuntu_16_04_32.run | 15 ++- repos/ports/run/vbox5_vm_ubuntu_16_04_64.run | 3 +- repos/ports/run/vbox5_vm_win10_64.run | 6 +- repos/ports/run/vbox5_vm_win7_32.run | 1 + repos/ports/run/vbox5_vm_win7_64.run | 5 +- repos/ports/run/vbox5_win10_64.run | 6 +- repos/ports/run/vbox5_win7_32.run | 1 + repos/ports/run/vbox5_win7_64.run | 3 +- repos/ports/run/vbox5_win7_64_multiple.run | 3 +- repos/ports/run/vbox5_win7_64_raw.run | 3 +- repos/ports/run/vbox5_win7_64_share.run | 3 +- repos/ports/run/vbox_win.inc | 11 +- repos/ports/run/virtualbox_auto.inc | 25 +---- repos/ports/run/vm_ubuntu_16_04_32_1vcpu.vbox | 99 +++++++++++++++++ .../run/{vm_win10.vbox => vm_win10_64.vbox} | 2 +- repos/ports/run/vm_win10_64_1vcpu.vbox | 102 ++++++++++++++++++ repos/ports/run/vm_win7_64_1vcpu.vbox | 102 ++++++++++++++++++ 21 files changed, 361 insertions(+), 41 deletions(-) create mode 100644 repos/ports/run/vm_ubuntu_16_04_32_1vcpu.vbox rename repos/ports/run/{vm_win10.vbox => vm_win10_64.vbox} (98%) create mode 100644 repos/ports/run/vm_win10_64_1vcpu.vbox create mode 100644 repos/ports/run/vm_win7_64_1vcpu.vbox diff --git a/repos/ports/run/vbox5_ubuntu_14_04_32.run b/repos/ports/run/vbox5_ubuntu_14_04_32.run index 29d6a95546..1ec0cadda6 100644 --- a/repos/ports/run/vbox5_ubuntu_14_04_32.run +++ b/repos/ports/run/vbox5_ubuntu_14_04_32.run @@ -2,6 +2,9 @@ # Ubuntu 14.04 32bit in VBox 5 # +assert_spec x86 +assert_spec nova + set flavor "ubuntu_14_04_32" set vm_ram "1280M" diff --git a/repos/ports/run/vbox5_ubuntu_14_04_64.run b/repos/ports/run/vbox5_ubuntu_14_04_64.run index 332f2ef5d2..5e2107eb4b 100644 --- a/repos/ports/run/vbox5_ubuntu_14_04_64.run +++ b/repos/ports/run/vbox5_ubuntu_14_04_64.run @@ -2,7 +2,8 @@ # Ubuntu 14.04 64bit in VBox 5 # -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "ubuntu_14_04_64" set vm_ram "1280M" diff --git a/repos/ports/run/vbox5_ubuntu_16_04_32.run b/repos/ports/run/vbox5_ubuntu_16_04_32.run index a63879d2ac..9791e4576e 100644 --- a/repos/ports/run/vbox5_ubuntu_16_04_32.run +++ b/repos/ports/run/vbox5_ubuntu_16_04_32.run @@ -2,6 +2,9 @@ # Ubuntu 16.04 32bit in VBox 5 # +assert_spec x86 +assert_spec nova + set flavor "ubuntu_16_04_32" set vm_ram "1280M" diff --git a/repos/ports/run/vbox5_ubuntu_16_04_64.run b/repos/ports/run/vbox5_ubuntu_16_04_64.run index 660bf65d1a..377d61d985 100644 --- a/repos/ports/run/vbox5_ubuntu_16_04_64.run +++ b/repos/ports/run/vbox5_ubuntu_16_04_64.run @@ -2,7 +2,8 @@ # Ubuntu 16.04 64bit in VBox 5 # -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "ubuntu_16_04_64" set vm_ram "9460M" diff --git a/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run b/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run index 57f6ba053e..ca8f11638f 100644 --- a/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run +++ b/repos/ports/run/vbox5_vm_ubuntu_16_04_32.run @@ -2,7 +2,18 @@ # Ubuntu 16.04 32bit in VBox 5 # -set flavor "ubuntu_16_04_32" +assert_spec x86 + +if {(![have_spec nova] && ![have_spec foc])} { + puts "Platform is unsupported." +} + +if {[have_spec nova]} { + set flavor "ubuntu_16_04_32" +} else { + set flavor "ubuntu_16_04_32_1vcpu" +} + set vm_ram "1280M" set use_vbox5 1 @@ -17,7 +28,7 @@ set use_usb 1 set use_ps2 [have_spec ps2] set use_vms 1 -set use_cpu_load 1 +set use_cpu_load 0 # use generic vbox5 VMM version set use_vbox5_nova 0 diff --git a/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run b/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run index 944e73492b..59257429bc 100644 --- a/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run +++ b/repos/ports/run/vbox5_vm_ubuntu_16_04_64.run @@ -2,7 +2,8 @@ # Ubuntu 16.04 64bit in VBox 5 # -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "ubuntu_16_04_64" set vm_ram "9460M" diff --git a/repos/ports/run/vbox5_vm_win10_64.run b/repos/ports/run/vbox5_vm_win10_64.run index 58b07b84b9..9bdae2c9ed 100644 --- a/repos/ports/run/vbox5_vm_win10_64.run +++ b/repos/ports/run/vbox5_vm_win10_64.run @@ -3,10 +3,10 @@ # assert_spec nova -assert_spec 64bit +assert_spec x86_64 -set flavor "win10" -set vm_ram "1280M" +set flavor "win10_64_1vcpu" +set vm_ram "8280M" set use_vbox5 1 diff --git a/repos/ports/run/vbox5_vm_win7_32.run b/repos/ports/run/vbox5_vm_win7_32.run index dcdc1d2900..1c6ce0f34d 100644 --- a/repos/ports/run/vbox5_vm_win7_32.run +++ b/repos/ports/run/vbox5_vm_win7_32.run @@ -2,6 +2,7 @@ # Windows 7 in VirtualBox 5 # +assert_spec x86 assert_spec nova set flavor "win7" diff --git a/repos/ports/run/vbox5_vm_win7_64.run b/repos/ports/run/vbox5_vm_win7_64.run index 4012202a97..21773b5efc 100644 --- a/repos/ports/run/vbox5_vm_win7_64.run +++ b/repos/ports/run/vbox5_vm_win7_64.run @@ -2,9 +2,10 @@ # Windows 7 64bit in VirtualBox # -assert_spec 64bit +assert_spec x86_64 +assert_spec nova -set flavor "win7_64" +set flavor "win7_64_1vcpu" set vm_ram "9480M" set use_vbox5 1 diff --git a/repos/ports/run/vbox5_win10_64.run b/repos/ports/run/vbox5_win10_64.run index 271e1c5e12..ba723c63cf 100644 --- a/repos/ports/run/vbox5_win10_64.run +++ b/repos/ports/run/vbox5_win10_64.run @@ -3,10 +3,10 @@ # assert_spec nova -assert_spec 64bit +assert_spec x86_64 -set flavor "win10" -set vm_ram "1280M" +set flavor "win10_64" +set vm_ram "8280M" set use_vbox5 1 diff --git a/repos/ports/run/vbox5_win7_32.run b/repos/ports/run/vbox5_win7_32.run index f96d5985d6..a0aab89736 100644 --- a/repos/ports/run/vbox5_win7_32.run +++ b/repos/ports/run/vbox5_win7_32.run @@ -3,6 +3,7 @@ # assert_spec nova +assert_spec x86 set flavor "win7" set vm_ram "1280M" diff --git a/repos/ports/run/vbox5_win7_64.run b/repos/ports/run/vbox5_win7_64.run index eaf0aaeefc..ebf0a506d8 100644 --- a/repos/ports/run/vbox5_win7_64.run +++ b/repos/ports/run/vbox5_win7_64.run @@ -2,7 +2,8 @@ # Windows 7 64bit in VirtualBox # -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "win7_64" set vm_ram "9480M" diff --git a/repos/ports/run/vbox5_win7_64_multiple.run b/repos/ports/run/vbox5_win7_64_multiple.run index 8a4735cf6f..7820bdab28 100644 --- a/repos/ports/run/vbox5_win7_64_multiple.run +++ b/repos/ports/run/vbox5_win7_64_multiple.run @@ -12,7 +12,8 @@ # ... # lCPU 6-7: VM6 2 vCPUs -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "win7_64" set flavor_extension "_multiple" diff --git a/repos/ports/run/vbox5_win7_64_raw.run b/repos/ports/run/vbox5_win7_64_raw.run index 7e17baf3a7..d1128b1557 100644 --- a/repos/ports/run/vbox5_win7_64_raw.run +++ b/repos/ports/run/vbox5_win7_64_raw.run @@ -2,7 +2,8 @@ # Windows 7 64bit in VirtualBox # -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "win7_64_raw" set vm_ram "1280M" diff --git a/repos/ports/run/vbox5_win7_64_share.run b/repos/ports/run/vbox5_win7_64_share.run index f44441ffb2..3ad3a6a345 100644 --- a/repos/ports/run/vbox5_win7_64_share.run +++ b/repos/ports/run/vbox5_win7_64_share.run @@ -1,4 +1,5 @@ -assert_spec 64bit +assert_spec x86_64 +assert_spec nova set flavor "win7_64" set vm_ram "1280M" diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 938d39eb60..50db1b3618 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -1,5 +1,6 @@ -# Tested for nova and muen. -if {(![have_spec nova] && ![have_spec muen])} { +assert_spec x86 + +if {(![have_spec nova] && ![have_spec foc])} { puts "Platform is unsupported." exit 0 } @@ -286,7 +287,11 @@ append_if [expr !$use_rumpfs] boot_modules " ${raw_image} " build_boot_image $boot_modules -run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: no, hostWindowMapping: no, graphics: no} 70 +set wait_timeout 70 +if {[have_spec foc]} { set wait_timeout 120 } + +run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: no, hostWindowMapping: no, graphics: no} $wait_timeout + # run_genode_until forever 0 [output_spawn_id] if {$use_rumpfs} { diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index a786c9cef3..ea9b18d799 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -1,4 +1,6 @@ -if {(![have_spec nova] && ![have_spec muen])} { +assert_spec x86 + +if {(![have_spec nova] && ![have_spec foc])} { puts "Platform is unsupported." exit 0 } @@ -8,16 +10,6 @@ if {[have_include "power_on/qemu"]} { exit } -if {([have_spec muen] && [expr $use_vbox5])} { - puts "Run script does not support vbox5 on Muen." - exit 0 -} - -if {([have_spec muen] && $flavor != "win7")} { - puts "Run script does not support $flavor on Muen." - exit 0 -} - if { [get_cmd_switch --autopilot] && [have_spec x86_32] } { puts "Run script does not support autopilot mode on 32 bit" exit 0 @@ -252,15 +244,8 @@ append_if [expr $use_usb] config { - } - -append_if [expr $use_usb && ![have_spec muen]] config { -} - -append_if [expr $use_usb && [have_spec muen]] config { -} - -append_if [expr $use_usb] config { + + diff --git a/repos/ports/run/vm_ubuntu_16_04_32_1vcpu.vbox b/repos/ports/run/vm_ubuntu_16_04_32_1vcpu.vbox new file mode 100644 index 0000000000..3aa20d10a9 --- /dev/null +++ b/repos/ports/run/vm_ubuntu_16_04_32_1vcpu.vbox @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/ports/run/vm_win10.vbox b/repos/ports/run/vm_win10_64.vbox similarity index 98% rename from repos/ports/run/vm_win10.vbox rename to repos/ports/run/vm_win10_64.vbox index 46acfebccb..33813967b1 100644 --- a/repos/ports/run/vm_win10.vbox +++ b/repos/ports/run/vm_win10_64.vbox @@ -31,7 +31,7 @@ - + diff --git a/repos/ports/run/vm_win10_64_1vcpu.vbox b/repos/ports/run/vm_win10_64_1vcpu.vbox new file mode 100644 index 0000000000..f13b592d5b --- /dev/null +++ b/repos/ports/run/vm_win10_64_1vcpu.vbox @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/ports/run/vm_win7_64_1vcpu.vbox b/repos/ports/run/vm_win7_64_1vcpu.vbox new file mode 100644 index 0000000000..d17cab15d8 --- /dev/null +++ b/repos/ports/run/vm_win7_64_1vcpu.vbox @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +