From 6143563a4e594c49b8628ba9298dbf95aac627c1 Mon Sep 17 00:00:00 2001
From: Douglas RAILLARD <douglas.raillard@arm.com>
Date: Fri, 23 Nov 2018 18:49:08 +0000
Subject: [PATCH 1/3] bisector: Fix env var updating

Only update the env var of the subprocess
---
 tools/bisector/bisector/bisector.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/bisector/bisector/bisector.py b/tools/bisector/bisector/bisector.py
index cab7dae29..5c8dea44b 100755
--- a/tools/bisector/bisector/bisector.py
+++ b/tools/bisector/bisector/bisector.py
@@ -1276,7 +1276,9 @@ class StepBase(StepABC):
 
         # Merge the dictionaries, env takes precedence
         user_env = env
-        env = copy.copy(os.environ)
+        # A deepcopy is required, otherwise we modify our own environment as
+        # well
+        env = copy.deepcopy(os.environ)
         env.update(user_env)
 
         for j in range(1, self.trials + 1):
-- 
GitLab


From 30f3a5f405d658f6d67aaf2918d2775cdfb491d5 Mon Sep 17 00:00:00 2001
From: Douglas RAILLARD <douglas.raillard@arm.com>
Date: Fri, 23 Nov 2018 18:52:13 +0000
Subject: [PATCH 2/3] shell: fix lisa shell

---
 init_env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init_env b/init_env
index e1d388e63..5e59e95c2 100644
--- a/init_env
+++ b/init_env
@@ -55,6 +55,6 @@ else
 	echo "Please, source this configuration from a terminal running BASH."
 fi
 
-exit $RET
+return $RET
 
 # vim :set tabstop=4 shiftwidth=4 textwidth=80 expandtab
-- 
GitLab


From 63aed04a495270eb1def2c2f249838454f22d0c4 Mon Sep 17 00:00:00 2001
From: Douglas RAILLARD <douglas.raillard@arm.com>
Date: Mon, 26 Nov 2018 14:54:00 +0000
Subject: [PATCH 3/3] bisector: fix trailing comma

Python < 3.6 grammar does not allow trailing comma in parameter list in
function definitions.
---
 tools/bisector/bisector/bisector.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bisector/bisector/bisector.py b/tools/bisector/bisector/bisector.py
index 5c8dea44b..392e11ac5 100755
--- a/tools/bisector/bisector/bisector.py
+++ b/tools/bisector/bisector/bisector.py
@@ -1785,7 +1785,7 @@ class ExekallLISATestStep(ShellStep):
     def __init__(self,
             compress_artifact = Default,
             upload_artifact = Default,
-            **kwargs,
+            **kwargs
         ):
         super().__init__(**kwargs)
 
@@ -2301,7 +2301,7 @@ class LISATestStep(ShellStep):
     def __init__(self,
             compress_results = Default,
             upload_results = Default,
-            **kwargs,
+            **kwargs
         ):
         super().__init__(**kwargs)
         self.upload_results = upload_results
-- 
GitLab