Francois Gouget : testbot/LogUtils: Ignore end-of-line spaces when matching error lines.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Jan 26 04:38:47 2021 +0100

testbot/LogUtils: Ignore end-of-line spaces when matching error lines.

End-of-line spaces should be rare but more importantly they don't
materially change the error line and can make it hard to match errors
in TestWTBS.

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

---

 testbot/lib/WineTestBot/LogUtils.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 7971435..7786494 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -1115,8 +1115,11 @@ sub _GetLineKey($)
   my ($Line) = @_;
   return undef if (!defined $Line);
 
+  # Remove end-of-line spaces
+  $Line =~ s/ +$//;
+
   # Remove the line number
-  $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/
+  $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block):)/$1$2/
 
   # Remove the crash code address: it changes whenever the test is recompiled
   or $Line =~ s/^(Unhandled exception: .* code) \(0x[0-9a-fA-F]{8,16}\)\.$/$1/