Francois Gouget : testbot: Centralize the $PATH cleanup.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Sep  4 15:36:58 2019 +0200

testbot: Centralize the $PATH cleanup.

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

---

 testbot/bin/Engine.pl               | 1 -
 testbot/bin/Janitor.pl              | 2 --
 testbot/bin/LibvirtTool.pl          | 2 --
 testbot/bin/WineRunBuild.pl         | 2 --
 testbot/bin/WineRunReconfig.pl      | 2 --
 testbot/bin/WineRunTask.pl          | 2 --
 testbot/bin/WineRunWineTest.pl      | 2 --
 testbot/bin/WineSendLog.pl          | 2 --
 testbot/lib/WineTestBot/Config.pm   | 2 ++
 testbot/lib/WineTestBot/VMs.pm      | 1 -
 testbot/scripts/CheckWineTestBot.pl | 2 --
 11 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl
index 9ffdf96..81d3afc 100755
--- a/testbot/bin/Engine.pl
+++ b/testbot/bin/Engine.pl
@@ -741,7 +741,6 @@ sub main()
     exit 1;
   }
 
-  $ENV{PATH} = "/usr/bin:/bin";
   $SIG{CHLD} = \&REAPER;
 
   $WineTestBot::Engine::Notify::RunningInEngine = 1;
diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl
index e766285..537a0dc 100755
--- a/testbot/bin/Janitor.pl
+++ b/testbot/bin/Janitor.pl
@@ -76,8 +76,6 @@ sub Error(@)
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 # Grab the command line options
 my ($Usage, $DryRun);
 while (@ARGV)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index a078fcb..4000c14 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -87,8 +87,6 @@ EOF
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 # Grab the command line options
 my ($Usage, $Action, $VMKey);
 while (@ARGV)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index b1349f0..fdcf770 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -72,8 +72,6 @@ sub Error(@)
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 my $Usage;
 sub ValidateNumber($$)
 {
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 378bd94..493ab10 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -73,8 +73,6 @@ sub Error(@)
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 my $Usage;
 sub ValidateNumber($$)
 {
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index e6112fd..6a71849 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -103,8 +103,6 @@ sub TakeScreenshot($$)
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 my $Usage;
 sub ValidateNumber($$)
 {
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index a74877a..74b974a 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -102,8 +102,6 @@ sub TakeScreenshot($$)
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 my $Usage;
 sub ValidateNumber($$)
 {
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 28644fb..721122e 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -406,8 +406,6 @@ EOF
 # Setup and command line processing
 #
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 my $Usage;
 sub ValidateNumber($$)
 {
diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm
index d6267de..b72968c 100644
--- a/testbot/lib/WineTestBot/Config.pm
+++ b/testbot/lib/WineTestBot/Config.pm
@@ -71,6 +71,8 @@ $BinDir = "$::RootDir/bin";
 
 # Sanitize the environment for system() & co
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; # from perlsec
+$ENV{PATH} = "/usr/bin:/bin";
+
 
 # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm
 $MaxRevertingVMs = 1;
diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm
index 6770547..5d738e2 100644
--- a/testbot/lib/WineTestBot/VMs.pm
+++ b/testbot/lib/WineTestBot/VMs.pm
@@ -447,7 +447,6 @@ sub Run($$$$$$)
   WineTestBot::Log::LogMsg("Starting child: @$Args\n");
   $ChildSetup->($VM, $SetupData);
 
-  $ENV{PATH} = "/usr/bin:/bin";
   exec(@$Args) or
       WineTestBot::Log::LogMsg("Unable to exec $Tool: $!\n");
 
diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl
index 0af2550..3ca4fde 100755
--- a/testbot/scripts/CheckWineTestBot.pl
+++ b/testbot/scripts/CheckWineTestBot.pl
@@ -38,8 +38,6 @@ sub BEGIN
 use WineTestBot::Config;
 use WineTestBot::Engine::Notify;
 
-$ENV{PATH} = "/usr/bin:/bin";
-
 my $rc = 0;
 if (! PingEngine())
 {