Francois Gouget : testbot/build: Allow both commas and colons in the target lists.

Alexandre Julliard julliard at winehq.org
Mon Aug 20 12:41:40 CDT 2018


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Aug 20 09:08:10 2018 +0200

testbot/build: Allow both commas and colons in the target lists.

This paves the way to a future switch to colons.
It is only needed for Build.pl and WineTest.pl since the TestBot does
not pass a target list to the Reconfig scripts.

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

---

 testbot/bin/build/Build.pl    | 2 +-
 testbot/bin/build/WineTest.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 920fc82..b729d95 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -250,7 +250,7 @@ if (!defined $Usage)
   }
 
   $TargetList = join(",", keys %AllTargets) if (!defined $TargetList);
-  foreach my $Target (split /,/, $TargetList)
+  foreach my $Target (split /[,:]/, $TargetList)
   {
     $Target = "exe$1" if ($Target =~ /^(32|64)$/);
     if (!$AllTargets{$Target})
diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index 1010619..3310b4c 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -282,7 +282,7 @@ if (!defined $Usage)
 {
   if (defined $TargetList)
   {
-    foreach my $Target (split /,/, $TargetList)
+    foreach my $Target (split /[,:]/, $TargetList)
     {
       if (!$AllTargets{$Target})
       {




More information about the wine-cvs mailing list