Francois Gouget : testbot/build: Remove unneeded Reconfig vs. WineReconfig differences.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Wed Jan  6 23:29:54 2021 +0100

testbot/build: Remove unneeded Reconfig vs. WineReconfig differences.

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

---

 testbot/bin/build/Reconfig.pl     |  1 +
 testbot/bin/build/WineReconfig.pl | 17 ++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index 458b5da..9e1043a 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -152,6 +152,7 @@ if (defined $Usage)
   print "Where:\n";
   print "  --update     Update Wine's source code.\n";
   print "  --build      Update the Wine builds.\n";
+  print "If none of the above actions is specified they are all performed.\n";
   print "  MISSIONS     Is a colon-separated list of missions. By default the following\n";
   print "               missions are run.\n";
   print "               - exe32: Build the 32 bit Windows test executables.\n";
diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl
index bd9ff57..75a21b3 100755
--- a/testbot/bin/build/WineReconfig.pl
+++ b/testbot/bin/build/WineReconfig.pl
@@ -168,15 +168,15 @@ if (defined $Usage)
   }
   print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--help] [MISSIONS]\n";
   print "\n";
-  print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n";
+  print "Performs all the tasks needed for the host to be ready to run Wine tests: update the Wine source and addons, and rebuild the Wine binaries.\n";
   print "\n";
   print "Where:\n";
   print "  --update     Update Wine's source code.\n";
   print "  --build      Update the Wine builds.\n";
   print "  --addons     Update the Gecko and Mono Wine addons.\n";
   print "If none of the above actions is specified they are all performed.\n";
-  print "  MISSIONS     Is a colon-separated list of missions. By default the\n";
-  print "               following missions are run.\n";
+  print "  MISSIONS     Is a colon-separated list of missions. By default the following\n";
+  print "               missions are run.\n";
   print "               - win32: Build the regular 32 bit Wine.\n";
   print "               - wow32: Build the 32 bit WoW Wine.\n";
   print "               - wow64: Build the 64 bit WoW Wine.\n";
@@ -185,21 +185,20 @@ if (defined $Usage)
   exit 0;
 }
 
-if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging")
+if ($DataDir =~ /'/)
 {
-    LogMsg "Unable to create '$DataDir/staging': $!\n";
+    LogMsg "The install path contains invalid characters\n";
     exit(1);
 }
-
-if ($DataDir =~ /'/)
+if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging")
 {
-    LogMsg "The install path contains invalid characters\n";
+    LogMsg "Unable to create '$DataDir/staging': $!\n";
     exit(1);
 }
 
 
 #
-# Run the builds and/or tests
+# Run the builds
 #
 
 exit(1) if ($OptBuild and !BuildNativeTestAgentd());