[pkg-kolab] r1435 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-28 14:29:55 +0000 (Sat, 28 Nov 2009)
New Revision: 1435

Modified:
   pkg-kolab_testsuite/testsuite
Log:
- more verbosity
- need $SIG{CHLD} = 'DEFAULT' (see perlipc)


Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-28 12:06:05 UTC (rev 1434)
+++ pkg-kolab_testsuite/testsuite	2009-11-28 14:29:55 UTC (rev 1435)
@@ -144,8 +144,10 @@
 sub local_command
 {
     my $command = shift;
+    local $SIG{CHLD} = 'DEFAULT';
     my $ret = system($command);
-    print "Return value: $ret\n" if($ret);
+    print "\nReturn value: $ret\nCommand was: $command\n" if($ret);
+    return $ret;
 }
 #-------------------------------------------------------
 sub remote_command
@@ -163,7 +165,8 @@
             '-i', conf('storage_pool_dir').'/key',
             "root\@$domip");
     }
-    print "Return value: $ret\n" if($ret);
+    print "\nReturn value: $ret\nRemote command was: $command\n" if($ret);
+    return $ret;
 }
 
 #-------------------------------------------------------
@@ -331,7 +334,7 @@
     local_command("sudo mv /tmp/pkg-kolab-extlinux.conf '$CHROOT/extlinux.conf'");
 
     #linux kernel
-    local_command("cat <<EOF > $storagepooldir/kernel-img.conf
+    local_command("cat <<EOF > /tmp/pkg-kolab-kernel-img.conf
 do_symlinks = yes
 relative_links = yes
 do_bootloader = no
@@ -342,7 +345,7 @@
 postrm_hook   = #update-grub
 EOF
 ");
-    local_command("sudo mv $storagepooldir/kernel-img.conf '$CHROOT/etc/kernel-img.conf'");
+    local_command("sudo mv /tmp/pkg-kolab-kernel-img.conf '$CHROOT/etc/kernel-img.conf'");
     local_command("sudo chroot $CHROOT apt-get install -q linux-image-2.6.30-2-686");
 
     #remove xen specific