testbot: Fix the check for unknown options.

Francois Gouget fgouget at codeweavers.com
Thu Aug 7 20:11:56 CDT 2014


---

Applying this patch is kinda urgent as without it the WineTestBot is broken :-(

Here's what happened (I think). When I use the international keyboard 
layout ^ is a dead key and if I accidentally type - right after, I get a 
special dash (⁻) instead of -. The difference is not obvious in an 
editor or even in git diff on a UTF-8 terminal. But my email tool does 
not like this UTF-8 character and turns it into question marks. This is 
how the patch I submitted ended up which these invalid regular 
expressions (instead of merely checking for the wrong kind of dash).


 testbot/bin/RevertVM.pl        | 2 +-
 testbot/bin/WineRunBuild.pl    | 2 +-
 testbot/bin/WineRunReconfig.pl | 2 +-
 testbot/bin/WineRunTask.pl     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl
index 8539420..e8e7a87 100755
--- a/testbot/bin/RevertVM.pl
+++ b/testbot/bin/RevertVM.pl
@@ -107,7 +107,7 @@ while (@ARGV)
     $Usage = 0;
     last;
   }
-  elsif ($Arg =~ /^???/)
+  elsif ($Arg =~ /^-/)
   {
     Error "unknown option '$Arg'\n";
     $Usage = 2;
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 4aadcbb..ba6bb53 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -176,7 +176,7 @@ while (@ARGV)
     $Usage = 0;
     last;
   }
-  elsif ($Arg =~ /^???/)
+  elsif ($Arg =~ /^-/)
   {
     Error "unknown option '$Arg'\n";
     $Usage = 2;
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index cb66a64..3af46c9 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -177,7 +177,7 @@ while (@ARGV)
     $Usage = 0;
     last;
   }
-  elsif ($Arg =~ /^???/)
+  elsif ($Arg =~ /^-/)
   {
     Error "unknown option '$Arg'\n";
     $Usage = 2;
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index b7f235d..d82a156 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -193,7 +193,7 @@ while (@ARGV)
     $Usage = 0;
     last;
   }
-  elsif ($Arg =~ /^???/)
+  elsif ($Arg =~ /^-/)
   {
     Error "unknown option '$Arg'\n";
     $Usage = 2;
-- 
2.0.1


More information about the wine-patches mailing list