diff mbox

[OSSTEST,07/16] rump kernels: ts-rumprun-bake: Do not tolerate errors

Message ID 1475858096-16123-8-git-send-email-ian.jackson@eu.citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Jackson Oct. 7, 2016, 4:34 p.m. UTC 
If we skip due to missing the input pieces, make the warning noiser.

If we think we have all the input pieces, bomb out if they don't seem
to contain the right bits, or if rumpbake fails.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ts-rumprun-bake | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/ts-rumprun-bake b/ts-rumprun-bake
index d79d6f8..31ce259 100755
--- a/ts-rumprun-bake
+++ b/ts-rumprun-bake
@@ -61,15 +61,14 @@  sub bakeimage ($$) {
 	    ($ho, "rumpbake-n-$name", $execpart, $buildjob || $job);
     };
     if ($@) {
-	warn "skipping: $@";
+	logm "*** WARNING: skipping $name: $@";
 	return;
     }
     my $execfile = $execdist.$execpath;
 
     target_cmd_build($ho, 1000, $imagesdir, <<END);
-        if test -f $execfile; then
-            $rumpbake xen_pv $name $execfile
-        fi
+        ls -al $execfile
+        $rumpbake xen_pv $name $execfile
 END
 }
 
@@ -81,9 +80,8 @@  while (@ARGV) {
     die unless @ARGV>=2;
     my $name = shift @ARGV;
     my $rumpexec = shift @ARGV;
-    eval {
-	bakeimage($name,$rumpexec);
-    };
+
+    bakeimage($name,$rumpexec);
 }
 
 stash();