on master help sign in
Combine log files
commit6cacdb4c9ca32f6fe1a3094cf033814b4c10668f authorMichael Snoyman <michael@snoyman.com> dateFri 12 Dec 2014, 10:07 (12 years ago) parent98ea14a
1 file changed+7−9
Stackage2/PerformBuild.hs+7−9
Stackage2/PerformBuild.hs+7−9
@@ -212,14 +212,14 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
212212 , display $ ppVersion $ piPlan sbPackageInfo
213213 ]
214214
215− runIn wdir outH errH cmd args =
215+ runIn wdir outH cmd args =
216216 withCheckedProcess cp $ \ClosedStream UseProvidedHandle UseProvidedHandle ->
217217 (return () :: IO ())
218218 where
219219 cp = (proc (unpack $ asText cmd) (map (unpack . asText) args))
220220 { cwd = Just $ fpToString wdir
221221 , std_out = UseHandle outH
222− , std_err = UseHandle errH
222+ , std_err = UseHandle outH
223223 , env = Just sbModifiedEnv
224224 }
225225 runParent = runIn sbBuildDir
@@ -238,9 +238,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
238238 , ")\n"
239239 ]
240240 libOut = pbLogDir </> fpFromText namever </> "build.out"
241− libErr = pbLogDir </> fpFromText namever </> "build.err"
242241 testOut = pbLogDir </> fpFromText namever </> "test.out"
243− testErr = pbLogDir </> fpFromText namever </> "test.err"
244242 testRunOut = pbLogDir </> fpFromText namever </> "test-run.out"
245243
246244 wf fp inner = do
@@ -268,10 +266,10 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
268266
269267 PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo
270268
271− buildLibrary = wf libOut $ \outH -> wf libErr $ \errH -> do
272− let run = runChild outH errH
269+ buildLibrary = wf libOut $ \outH -> do
270+ let run = runChild outH
273271 log' $ "Unpacking " ++ namever
274− runParent outH errH "cabal" ["unpack", namever]
272+ runParent outH "cabal" ["unpack", namever]
275273
276274 log' $ "Configuring " ++ namever
277275 run "cabal" $ "configure" : configArgs
@@ -328,8 +326,8 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
328326 (Right (), ExpectFailure) -> warn $ namever ++ ": unexpected Haddock success"
329327 _ -> return ()
330328
331− runTests = wf testOut $ \outH -> wf testErr $ \errH -> do
332− let run = runChild outH errH
329+ runTests = wf testOut $ \outH -> do
330+ let run = runChild outH
333331
334332 when (pcTests /= Don'tBuild) $ do
335333 log' $ "Test configure " ++ namever