Merge pull request #6171 from commercialhaskell/re6170

Re #6170 Update tests to provide move info on failure

Author: mpilgrem

test/integration/tests/3926-ghci-with-sublibraries/Main.hs

@@ -17,7 +17,12 @@ replThread :: IO ()
 replThread = repl [] $ do
   replCommand ":main"
   line <- replGetLine
-  when (line /= "hello world") $ error "Main module didn't load correctly."
+  let expected = "hello world"
+  when (line /= expected) $
+    error $
+         "Main module didn't load correctly.\n"
+      <> "Expected: " <> expected <> "\n"
+      <> "Actual  : " <> line <> "\n"
   liftIO $ threadDelay 1000000 -- wait for an edit of the internal library
   reloadAndTest "testInt" "42" "Internal library didn't reload."
   liftIO $ threadDelay 1000000 -- wait for an edit of the internal library

test/integration/tests/4270-files-order/Main.hs

@@ -7,4 +7,9 @@ main = do
     repl [] $ do
         replCommand "putStrLn greeting"
         line <- replGetLine
-        when (line /= "Hello, world!") $ error "Didn't load correctly."
+        let expected = "Hello, world!"
+        when (line /= expected) $
+          error $
+               "Didn't load correctly.\n"
+            <> "Expected: " <> expected <> "\n"
+            <> "Actual  : " <> line <> "\n"

test/integration/tests/module-added-multiple-times/Main.hs

@@ -6,5 +6,9 @@ main :: IO ()
 main = repl [] $ do
     replCommand ":main"
     line <- replGetLine
-    when (line /= "Hello World!")
-        $ error "Main module didn't load correctly."
+    let expected = "Hello World!"
+    when (line /= expected) $
+      error $
+           "Main module didn't load correctly.\n"
+        <> "Expected: " <> expected <> "\n"
+        <> "Actual  : " <> line <> "\n"