Francois Gouget : testbot: Show which VM is blocking the revert in _DumpHostVMs().

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 25622c8c206af400dddae8614049e215ead470ef
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=25622c8c206af400dddae861...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Feb 23 04:39:46 2018 +0100

testbot: Show which VM is blocking the revert in _DumpHostVMs().

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/lib/WineTestBot/Jobs.pm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index ae1e4ec..3eba27b 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -1069,7 +1069,22 @@ sub _DumpHostVMs($$$$)
     $VM = $Sched->{VMs}->GetItem($VMKey);
     next if ($VM->GetHost() ne $HostKey);
 
-    push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]);
+    my $NeededVM = $NeededVMs->{$VMKey};
+    my $Dep = "";
+    if ($NeededVM->[3])
+    {
+      foreach my $DepVM (@{$NeededVM->[3]})
+      {
+        if ($DepVM->Status !~ /^(?:reverting|sleeping|running)$/)
+        {
+          $Dep = ":". $DepVM->Name;
+          last;
+        }
+      }
+      $Dep .= "/". scalar(@{$NeededVM->[3]});
+    }
+    push @VMInfo, join(":", "$VMKey(". $VM->Status ."$Dep)",
+                       $NeededVM->[0], $NeededVM->[1], $NeededVM->[2]);
   }
   my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") ||
                    $HostKey;