Francois Gouget : testbot/Janitor: Fix extracting the VM name from reference report filenames.

Alexandre Julliard julliard at winehq.org
Thu Dec 5 15:42:12 CST 2019


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Dec  5 13:22:16 2019 +0100

testbot/Janitor: Fix extracting the VM name from reference report filenames.

The log name part can contain underscores and uppercase letters when
testing locales.

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

---

 testbot/bin/Janitor.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl
index 537a0dc..c51637a 100755
--- a/testbot/bin/Janitor.pl
+++ b/testbot/bin/Janitor.pl
@@ -308,7 +308,7 @@ if (opendir(my $dh, "$DataDir/latest"))
   {
     next if ($Entry eq "." or $Entry eq "..");
 
-    if ($Entry =~ /^(.*)_[a-z0-9]+\.report(?:\.err)?$/)
+    if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/)
     {
       # Keep the reference WineTest reports for all VMs even if they are
       # retired or scheduled for deletion.




More information about the wine-cvs mailing list