Francois Gouget : testbot/build: Simplify the --no-rm handling.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon Mar 16 23:55:03 2020 +0100

testbot/build: Simplify the --no-rm handling.

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

---

 testbot/bin/build/Reconfig.pl     | 6 ++++--
 testbot/bin/build/WineReconfig.pl | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index f0ed128..62644e1 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -40,6 +40,8 @@ sub BEGIN
   $::BuildEnv = 1;
 }
 
+use File::Path;
+
 use Build::Utils;
 use WineTestBot::Config;
 use WineTestBot::Missions;
@@ -53,13 +55,13 @@ sub BuildNative($)
 {
   my ($NoRm) = @_;
 
+  rmtree "$DataDir/wine-native" if (!$NoRm);
   mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native");
 
   # Rebuild from scratch to make sure cruft will not accumulate
   InfoMsg "\nRebuilding native tools\n";
   my $CPUCount = GetCPUCount();
   system("cd '$DataDir/wine-native' && set -x && ".
-         ($NoRm ? "" : "rm -rf * && ") .
          "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ".
          "time make -j$CPUCount __tooldeps__");
 
@@ -77,6 +79,7 @@ sub BuildCross($$$)
   my ($TaskMissions, $NoRm, $Build) = @_;
 
   return 1 if (!$TaskMissions->{Builds}->{$Build});
+  rmtree "$DataDir/wine-$Build" if (!$NoRm);
   mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build");
 
   # Rebuild from scratch to make sure cruft will not accumulate
@@ -84,7 +87,6 @@ sub BuildCross($$$)
   my $CPUCount = GetCPUCount();
   my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32");
   system("cd '$DataDir/wine-$Build' && set -x && ".
-         ($NoRm ? "" : "rm -rf * && ") .
          "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ".
          "time make -j$CPUCount buildtests");
   if ($? != 0)
diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl
index 835be46..ad0d429 100755
--- a/testbot/bin/build/WineReconfig.pl
+++ b/testbot/bin/build/WineReconfig.pl
@@ -54,6 +54,7 @@ sub BuildWine($$$$;$)
   my ($TaskMissions, $NoRm, $Build, $Extras, $WithWine) = @_;
 
   return 1 if (!$TaskMissions->{Builds}->{$Build});
+  rmtree "$DataDir/wine-$Build" if (!$NoRm);
   mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build");
 
   # If $NoRm is not set, rebuild from scratch to make sure cruft will not
@@ -62,7 +63,6 @@ sub BuildWine($$$$;$)
   my $CPUCount = GetCPUCount();
   $Extras .= " --with-wine64='$WithWine'" if (defined $WithWine);
   system("cd '$DataDir/wine-$Build' && set -x && ".
-         ($NoRm ? "" : "rm -rf * && ") .
          "time ../wine/configure $Extras && ".
          "time make -j$CPUCount");
   if ($? != 0)