From d424f6e06679056fa15e80331d2d7831fbac6cba Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Wed, 23 Aug 2017 14:23:33 +0200 Subject: [PATCH] vbox*.run: fix scripts - cap quota shortage - ram quota shortage - limit VM memory to 1 GB (before 9 GB) in multiple run test case --- repos/ports/run/vbox4_win7_64_multiple.run | 3 +- repos/ports/run/vbox5_win7_64_multiple.run | 3 +- repos/ports/run/vbox_win.inc | 8 +- repos/ports/run/virtualbox_auto.inc | 4 +- repos/ports/run/vm_win7_64_multiple.vbox | 102 +++++++++++++++++++++ 5 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 repos/ports/run/vm_win7_64_multiple.vbox diff --git a/repos/ports/run/vbox4_win7_64_multiple.run b/repos/ports/run/vbox4_win7_64_multiple.run index 9dd4b778b..4b336168b 100644 --- a/repos/ports/run/vbox4_win7_64_multiple.run +++ b/repos/ports/run/vbox4_win7_64_multiple.run @@ -15,6 +15,7 @@ assert_spec 64bit set flavor "win7_64" +set flavor_extension "_multiple" set vm_ram "1280M" set use_vbox4 1 @@ -31,6 +32,6 @@ set use_ps2 [have_spec ps2] set use_vms 6 set affinity_space_width 8 -set use_cpu_load 1 +set use_cpu_load 0 source ${genode_dir}/repos/ports/run/vbox_win.inc diff --git a/repos/ports/run/vbox5_win7_64_multiple.run b/repos/ports/run/vbox5_win7_64_multiple.run index 748b0efee..679313b4a 100644 --- a/repos/ports/run/vbox5_win7_64_multiple.run +++ b/repos/ports/run/vbox5_win7_64_multiple.run @@ -15,6 +15,7 @@ assert_spec 64bit set flavor "win7_64" +set flavor_extension "_multiple" set vm_ram "1280M" set use_vbox4 0 @@ -31,6 +32,6 @@ set use_ps2 [have_spec ps2] set use_vms 6 set affinity_space_width 8 -set use_cpu_load 1 +set use_cpu_load 0 source ${genode_dir}/repos/ports/run/vbox_win.inc diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index cbfa3d6e3..c56434050 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -19,6 +19,10 @@ set raw_image "${flavor}.vmdk" set vbox_file "vm_${flavor}.vbox" set overlay_image "overlay_${flavor}.vdi" +if {[info exists flavor_extension]} { + set vbox_file "vm_${flavor}${flavor_extension}.vbox" +} + set build_components { server/input_merger drivers/nic @@ -247,7 +251,7 @@ append config_of_app { for { set i 1} { $i <= $use_vms } { incr i} { append config_of_app " - " + " append_if [expr $use_vbox4] config_of_app " " append_if [expr $use_vbox5] config_of_app " @@ -328,7 +332,7 @@ run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamle if {$use_rumpfs} { set wait_timeout 170 for { set i 1 } { $i <= $use_vms } { incr i } { - if { [string match "ubuntu*" $flavor] } { + if { [string match "ubuntu*" $flavor] || [string match "win81*" $flavor] } { run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: no} $wait_timeout [output_spawn_id] } else { run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} $wait_timeout [output_spawn_id] diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index a30fa67b9..a093360fe 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -127,7 +127,7 @@ append_if [expr $use_rumpfs] config { } append_if [expr $use_ram_fs] config { - } + } append_if [expr $use_ram_fs] config " " append_if [expr $use_ram_fs] config { @@ -304,7 +304,7 @@ append_if [expr $use_usb] config { - + diff --git a/repos/ports/run/vm_win7_64_multiple.vbox b/repos/ports/run/vm_win7_64_multiple.vbox new file mode 100644 index 000000000..89780f3a4 --- /dev/null +++ b/repos/ports/run/vm_win7_64_multiple.vbox @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +