Francois Gouget : testbot: There is no point unsetting $ENV.

Alexandre Julliard julliard at winehq.org
Wed Jan 9 15:50:42 CST 2019


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Jan  9 10:03:52 2019 +0100

testbot: There is no point unsetting $ENV.

It is not a special environment variable or perl value and typically
does not even exist.

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              | 1 -
 testbot/bin/LibvirtTool.pl          | 2 --
 testbot/bin/WineRunBuild.pl         | 1 -
 testbot/bin/WineRunReconfig.pl      | 1 -
 testbot/bin/WineRunTask.pl          | 1 -
 testbot/bin/WineRunWineTest.pl      | 1 -
 testbot/bin/WineSendLog.pl          | 1 -
 testbot/bin/build/Build.pl          | 1 -
 testbot/bin/build/Reconfig.pl       | 1 -
 testbot/bin/build/WineReconfig.pl   | 1 -
 testbot/bin/build/WineTest.pl       | 1 -
 testbot/scripts/CheckWineTestBot.pl | 1 -
 13 files changed, 14 deletions(-)

diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl
index 79b25fa..9ffdf96 100755
--- a/testbot/bin/Engine.pl
+++ b/testbot/bin/Engine.pl
@@ -742,7 +742,6 @@ sub main()
   }
 
   $ENV{PATH} = "/usr/bin:/bin";
-  delete $ENV{ENV};
   $SIG{CHLD} = \&REAPER;
 
   $WineTestBot::Engine::Notify::RunningInEngine = 1;
diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl
index 1208451..e766285 100755
--- a/testbot/bin/Janitor.pl
+++ b/testbot/bin/Janitor.pl
@@ -77,7 +77,6 @@ sub Error(@)
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
 
 # Grab the command line options
 my ($Usage, $DryRun);
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index e6742f4..a078fcb 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -88,8 +88,6 @@ EOF
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
-
 
 # Grab the command line options
 my ($Usage, $Action, $VMKey);
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 68e6be4..b1349f0 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -73,7 +73,6 @@ sub Error(@)
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $Usage;
 sub ValidateNumber($$)
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index d7e72bf..fd9a56d 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -74,7 +74,6 @@ sub Error(@)
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $Usage;
 sub ValidateNumber($$)
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index fea8c03..e6112fd 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -104,7 +104,6 @@ sub TakeScreenshot($$)
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $Usage;
 sub ValidateNumber($$)
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index 5ce1448..8792be3 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -103,7 +103,6 @@ sub TakeScreenshot($$)
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $Usage;
 sub ValidateNumber($$)
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index a651c09..1d13454 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -407,7 +407,6 @@ EOF
 #
 
 $ENV{PATH} = "/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $Usage;
 sub ValidateNumber($$)
diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index b50a25c..894686d 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -115,7 +115,6 @@ sub BuildTestExecutables($$$)
 #
 
 $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin";
-delete $ENV{ENV};
 
 my ($Usage, $PatchFile, $MissionStatement);
 while (@ARGV)
diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index b720788..c43fbda 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -111,7 +111,6 @@ sub UpdateWineBuilds($$)
 #
 
 $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin";
-delete $ENV{ENV};
 
 my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement);
 while (@ARGV)
diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl
index 7781095..4e03c31 100755
--- a/testbot/bin/build/WineReconfig.pl
+++ b/testbot/bin/build/WineReconfig.pl
@@ -143,7 +143,6 @@ sub UpdateWinePrefixes($)
 #
 
 $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin";
-delete $ENV{ENV};
 
 my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement);
 while (@ARGV)
diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index b47a6bf..7e6b822 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -210,7 +210,6 @@ sub TestExe($$$)
 #
 
 $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $Action = "";
 my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag);
diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl
index a0c0bda..9c2e291 100755
--- a/testbot/scripts/CheckWineTestBot.pl
+++ b/testbot/scripts/CheckWineTestBot.pl
@@ -39,7 +39,6 @@ use WineTestBot::Config;
 use WineTestBot::Engine::Notify;
 
 $ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin";
-delete $ENV{ENV};
 
 my $rc = 0;
 if (! PingEngine())




More information about the wine-cvs mailing list