From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 24 Nov 2010 08:38:35 +0000 (+0000)
Subject: regressions: Fix test-launch-race to work in non-supermin case.
X-Git-Tag: 1.7.13~12
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=c6478d6a01c210ef19735429d7602e3458733e25;ds=sidebyside

regressions: Fix test-launch-race to work in non-supermin case.
---

diff --git a/regressions/test-launch-race.pl b/regressions/test-launch-race.pl
index 941eff6..892353e 100755
--- a/regressions/test-launch-race.pl
+++ b/regressions/test-launch-race.pl
@@ -50,11 +50,15 @@ $g = undef;
 waitpid ($pid, 0) or die ("waitpid: $!");
 die ("child failed") unless ($? == 0);
 
-# Check that only 1 temporary cache directory was created
+# Check that only 1 temporary cache directory was created.
+#
+# No cache directory is OK too (as long as the appliance launched w/o
+# failure) because it indicates we're not using supermin.
 my $dh;
 opendir ($dh, $tmpdir) or die ("Failed to open $tmpdir: $!");
 my @cachedirs = grep { /^guestfs\./ } readdir ($dh);
 closedir ($dh) or die ("Failed to close $tmpdir: $!");
 
 my $ncachedirs = scalar(@cachedirs);
-die ("Expected 1 cachedir, found $ncachedirs") unless ($ncachedirs == 1);
+die "Expected 0 or 1 cachedir, found $ncachedirs"
+    unless $ncachedirs == 0 || $ncachedirs == 1;