From 978c95e5c484e0b6acf17cd6379a81b83721a5b1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 3 Feb 2017 04:18:16 +0100
Subject: [PATCH] test: helpers.clear(): Set common env vars only if not
 passed.

---
 test/functional/helpers.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 880cb6546c..ca59c0dd2e 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -290,7 +290,9 @@ local function clear(...)
         'NVIM_LOG_FILE',
         'NVIM_RPLUGIN_MANIFEST',
       }) do
-        env_tbl[k] = os.getenv(k)
+        if not env_tbl[k] then
+          env_tbl[k] = os.getenv(k)
+        end
       end
       env = {}
       for k, v in pairs(env_tbl) do