[OSSTEST PATCH 09/13] rump kernel tests: Use guest-specific fs images location

[Ian Jackson <ian.jackson@eu.citrix.com>]

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>
---
 ts-rumpuserxen-demo-setup |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ts-rumpuserxen-demo-setup b/ts-rumpuserxen-demo-setup
index 4ad77f8..68ec7d4 100755
--- 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();
-- 
1.7.10.4