[pkg-kolab] r1429 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-27 07:50:34 +0000 (Fri, 27 Nov 2009)
New Revision: 1429

Modified:
   pkg-kolab_testsuite/testsuite
   pkg-kolab_testsuite/testsuite.ini
Log:
- default vm size: 1Gb, 2Gb for openpkg (more for all the source and compiled packages)
- default vm mem: 256Mb, 512Mb for openpkg (more for compilation)
- libirt doesn't understand Gb and Mb suffix: convert


Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-26 22:19:44 UTC (rev 1428)
+++ pkg-kolab_testsuite/testsuite	2009-11-27 07:50:34 UTC (rev 1429)
@@ -167,6 +167,21 @@
     print "Return value: $ret\n" if($ret);
 }
 
+#-------------------------------------------------------
+sub size_to_kb
+{
+    my $size = shift;
+    if ( $size =~ /^([0-9.]+)Gb?$/i )
+    {
+        $size = $1 * 1024 . "M";
+    }
+    if ( $size =~ /^([0-9.]+)Mb?$/i )
+    {
+        $size = $1 * 1024;
+    }
+    return $size;
+}
+
 #=======================================================
 # Domain functions
 #-------------------------------------------------------
@@ -375,9 +390,7 @@
     my $domid = shift;
     my $domname = shift;
     
-    my $size = conf('vm_size');
-    my $memory = conf('vm_memory');
-    my $swap = conf('vm_swap');
+    my $memory = size_to_kb(conf('vm_memory'));
     my $storagepooldir = conf('storage_pool_dir');
     my $bridge = conf('bridge');
 

Modified: pkg-kolab_testsuite/testsuite.ini
===================================================================
--- pkg-kolab_testsuite/testsuite.ini	2009-11-26 22:19:44 UTC (rev 1428)
+++ pkg-kolab_testsuite/testsuite.ini	2009-11-27 07:50:34 UTC (rev 1429)
@@ -7,7 +7,7 @@
 
 ; vm
 vm_memory=256Mb
-vm_size=2Gb
+vm_size=1Gb
 vm_swap=128Mb
 vm_install_method=debootstrap; debootstrap
 vm_dist=sid
@@ -31,6 +31,9 @@
 kolab_installation_method=native
 
 [debian-sid-openpkg]
+vm_memory=512Mb; more for compilation
+vm_size=2Gb; more for all the source and compiled packages
+
 vm_install_method=debootstrap
 vm_dist=sid
 kolab_installation_method=openpkg