From 00bb13701293b4d1e8beac4a7ef0da6d4e671bbb Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Tue, 27 Nov 2012 23:52:02 +0100
Subject: [PATCH] New xen-delete-image option --no-xen-ok for disabling
 xenRunning tests

---
 bin/xen-delete-image | 8 +++++---
 t/xen-delete-image.t | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index 5f11d75..2761925 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -23,7 +23,8 @@ xen-delete-image - Delete previously created Xen instances.
    --hostname Specify the image name to delete.
 
   Testing options:
-   --test     Don't complain if we're not invoked by root.
+   --test      Don't complain if we're not invoked by root.
+   --no-xen-ok Don't complain if xen seems not installed or xend is not running
 
 =cut
 
@@ -221,7 +222,7 @@ E_O_ROOT
 #
 while ( my $name = shift )
 {
-    if ( !xenRunning($name, \%CONFIG) )
+    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%CONFIG) )
     {
         deleteXenImage($name);
     }
@@ -237,7 +238,7 @@ while ( my $name = shift )
 my $hosts = $CONFIG{ 'hostname' };
 foreach my $name (@$hosts)
 {
-    if ( !xenRunning($name, \%CONFIG) )
+    if ( $CONFIG{ 'no_xen_ok' } or !xenRunning($name, \%CONFIG) )
     {
         deleteXenImage($name);
     }
@@ -279,6 +280,7 @@ sub parseCommandLineArguments
                 "hostname=s@", \$CONFIG{ 'hostname' },
                 "test",        \$CONFIG{ 'test' },
                 "verbose",     \$CONFIG{ 'verbose' },
+                "no-xen-ok",   \$CONFIG{ 'no_xen_ok' },
                 "help",        \$HELP,
                 "manual",      \$MANUAL,
                 "version",     \$VERSION
diff --git a/t/xen-delete-image.t b/t/xen-delete-image.t
index 471d32b..2a0e5ad 100755
--- a/t/xen-delete-image.t
+++ b/t/xen-delete-image.t
@@ -75,7 +75,7 @@ close( IMAGE );
 #  So we need to run the deletion script and verify the images
 # are removed correctly.
 #
-`perl -I./lib -I../lib ./bin/xen-delete-image --test --dir=$dir $hostname`;
+`perl -I./lib -I../lib ./bin/xen-delete-image --test --no-xen-ok --dir=$dir $hostname`;
 
 
 #