Francois Gouget : testbot: Sort failures on their notes as a last resort.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Jun 24 16:25:29 2022 +0200

testbot: Sort failures on their notes as a last resort.

Sometimes a bug is spread across multiple failures and the Notes field
normally describes what each one corresponds to. Sorting on the Notes
field as a last resort typically ensures that all the parts are in an
order that makes sense.

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

---

 testbot/lib/WineTestBot/Failures.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm
index dc307bfa..6190ef25 100644
--- a/testbot/lib/WineTestBot/Failures.pm
+++ b/testbot/lib/WineTestBot/Failures.pm
@@ -50,11 +50,11 @@ sub Compare($$)
   # Sort deleted entries last
   my %StatusOrders = ("deleted" => 1);
 
-  my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) ||
+  return ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) ||
          $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") ||
          $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") ||
-         $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription");
-  return $Cmp
+         $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription") ||
+         $self->GetColValue("Notes") cmp $B->GetColValue("Notes");
 }
 
 sub BugId($;$)