Francois Gouget : testbot: Remove support for building with -Werror.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 12c7aabbd2c150b7da2f961ec39d37132880ec73
URL:    https://gitlab.winehq.org/winehq/tools/-/commit/12c7aabbd2c150b7da2f961ec39d...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Sat Apr  4 16:42:52 2020 +0200

testbot: Remove support for building with -Werror.

This feature is not used because compilation warnings should not get in
the way of testing how Windows (or Wine) behaves.

---

 testbot/lib/Build/Utils.pm          | 18 +++---------------
 testbot/lib/WineTestBot/LogUtils.pm |  4 ----
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index 689df28a..c1a02ac2 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -325,7 +325,6 @@ sub BuildTestLauncher()
 }
 
 our $FROM_SCRATCH = 1;
-our $TRY_WERROR = 2;
 
 sub BuildWine($$$$;$)
 {
@@ -339,20 +338,9 @@ sub BuildWine($$$$;$)
 
   InfoMsg "\nRebuilding the $Build Wine\n";
   my $CPUCount = GetCPUCount();
-  my $Rc = 1;
-  if (defined $Configure and ($Flags & $TRY_WERROR))
-  {
-    $Rc = system("cd '$DataDir/wine-$Build' && set -x && ".
-                 "time ../wine/configure $Configure --enable-werror && ".
-                 join(" && ", map { "time make -j$CPUCount $_" } @$Targets));
-    LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc);
-  }
-  if ($Rc)
-  {
-    $Rc = system("cd '$DataDir/wine-$Build' && set -x && ".
-                 (defined $Configure ? "time ../wine/configure $Configure && " : "").
-                 join(" && ", map { "time make -j$CPUCount $_" } @$Targets));
-  }
+  my $Rc = system("cd '$DataDir/wine-$Build' && set -x && ".
+                  (defined $Configure ? "time ../wine/configure $Configure && " : "").
+                  join(" && ", map { "time make -j$CPUCount $_" } @$Targets));
   if ($Rc)
   {
     LogMsg "The $Build Wine build failed\n";
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index fd850f8a..1e0ff38c 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -291,10 +291,6 @@ sub ParseTaskLog($)
     {
       $LogInfo->{$1} = "updated";
     }
-    elsif ($Line =~ /^Task: With -Werror the .* Wine build fails/)
-    {
-      ; # Show these non-fatal build errors
-    }
     elsif ($Line =~ /^Task: / or _IsPerlError($Line))
     {
       $LogInfo->{Task} = "failed";