Bugfix for printing v1

Author: schoettl

src/Print.hs

@@ -24,23 +24,23 @@ printShellTest format actualMode ShellTest{command=c,stdin=i,comments=comments,
               printComments comments
               printCommand "" c
               printStdin "<<<" i
-              printStdouterr ">>>" o
-              printStdouterr ">>>2" e
-              printExitStatus ">>>=" x
+              printStdouterr ">>>" $ justMatcherOutErr o
+              printStdouterr ">>>2" $ justMatcherOutErr e
+              printExitStatus True ">>>=" x
             "v2" -> do
               printComments comments
               printCommand "$ " c
               printStdin "<<<" i
               printStdouterr ">>>" o
               printStdouterr ">>>2" e
-              printExitStatus ">>>=" x
+              printExitStatus False ">>>=" x
             "v3" -> do
               printComments comments
               printCommand "$ "  c
               printStdin "<" i
               printStdouterr ">" o
               printStdouterr ">2" e
-              printExitStatus ">=" x
+              printExitStatus False ">=" x
             _ -> fail $ "Unsupported --print format: " ++ format
   where
     computeResults :: Maybe String -> IO (Maybe Matcher, Maybe Matcher, Matcher)
@@ -77,10 +77,12 @@ printStdouterr _ (Just (NegativeNumeric _)) = fail "FATAL: Cannot handle Matcher
 printStdouterr prefix (Just (Lines _ s))    = printf "%s\n%s\n" prefix s -- TODO trailing \n ?
 printStdouterr prefix (Just regex)          = printf "%s %s\n" prefix (show regex)
 
-printExitStatus :: String -> Matcher -> IO ()
-printExitStatus _ (Numeric "0") = return ()
-printExitStatus _ (Lines _ _) = fail "FATAL: Cannot handle Matcher (Lines) for exit status."
-printExitStatus prefix s = printf "%s %s\n" prefix (show s)
+-- | Print exit status. First arg says 'alwaysPrintEvenIfZero'.
+printExitStatus :: Bool -> String -> Matcher -> IO ()
+printExitStatus _ _ (Lines _ _) = fail "FATAL: Cannot handle Matcher (Lines) for exit status."
+printExitStatus False _     (Numeric "0") = return ()
+printExitStatus True prefix (Numeric "0") = printf "%s 0\n" prefix
+printExitStatus _ prefix s = printf "%s %s\n" prefix (show s)
 
 mkEither :: Bool -> a -> Either a a
 mkEither True = Right
@@ -89,3 +91,6 @@ mkEither False = Left
 fromEither :: Either a a -> a
 fromEither = either id id
 
+-- | Make a Matcher out of Nothing.
+justMatcherOutErr :: Maybe Matcher -> Maybe Matcher
+justMatcherOutErr = Just . fromMaybe (Lines 0 "")