rump kernel tests: Use guest-specific fs images location

We are going to want to have multiple different guests in the same
job.  Don't use the same locations for all of their fs images.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/ts-rumpuserxen-demo-setup b/ts-rumpuserxen-demo-setup
index 4ad77f869081b894e5b24d8c707eea65218869fd..68ec7d4061bd55c446f4551342e8e19d9fad659d 100755 (executable)
--- a/ts-rumpuserxen-demo-setup
+++ b/ts-rumpuserxen-demo-setup
@@ -42,7 +42,7 @@ sub prep () {
 
     my @images;
 
-    my $jobdir = target_jobdir($ho);
+    my $fsimagesdir = target_jobdir($ho)."/$gn-images";
 
     my $cfgfile = "$gn.cfg";
     my $cfgpath = "/etc/xen/$cfgfile";
@@ -62,7 +62,7 @@ sub prep () {
            if ($in eq 'disk') {
                s{\b img/(\w+.ffs) \b}{
                     push @images, $1;
-                    "$jobdir/$1";
+                    "$fsimagesdir/$1";
                 }xeg;
            }
 
@@ -72,8 +72,11 @@ sub prep () {
 
     store_runvar("$gho->{Guest}_cfgpath", $cfgpath);
 
-    target_cmd($ho, "cp $rkdist/img/$_ $jobdir/$_", 200)
-       foreach @images;
+    target_cmd($ho, <<END.(join "\n", map { <<END; } @images), 200);
+                   mkdir -p $fsimagesdir
+END
+                   cp $cfg_rkdist/img/$_ $fsimagesdir/$_
+END
 }
 
 prep();