Shorter merging suite-level an test-level environment

SamirTalwar · May 25, 2024 · 040a25e · 040a25e
1 parent 6d852d8
commit 040a25e
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/lib/Test/Smoke/Plan.hs b/src/lib/Test/Smoke/Plan.hs
@@ -80,19 +80,14 @@ readTest location fallbackWorkingDirectory fallbackShell fallbackCommand fallbac
   stdErr <- readStdErr location test
   files <- readFiles location test
   let revert = Vector.map (location </>) (testRevert test)
-  let environment = case (testEnvironment test, fallbackEnvironment) of
-        (Nothing, Nothing) -> Nothing
-        (Just env, Nothing) -> Just env
-        (Nothing, Just fallbackEnv) -> Just fallbackEnv
-        (Just env, Just fallbackEnv) -> Just (env <> fallbackEnv)
   pure $
     TestPlan
       { planTest = test,
         planWorkingDirectory = workingDirectory,
         planShell = fallbackShell,
         planExecutable = executable,
         planArgs = args,
-        planEnvironment = environment,
+        planEnvironment = testEnvironment test <> fallbackEnvironment,
         planStdIn = stdIn,
         planStatus = status,
         planStdOut = stdOut,