[commit: ghc] master: testsuite: Normalise away package name differences from safePkg01 (cd4477c)

git at git.haskell.org git at git.haskell.org
Thu Dec 13 04:27:45 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cd4477c9137d6df8dfc00d66d54900d45f047af9/ghc

>---------------------------------------------------------------

commit cd4477c9137d6df8dfc00d66d54900d45f047af9
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 12 16:57:01 2018 -0500

    testsuite: Normalise away package name differences from safePkg01
    
    Spurious changes observed in a integer-simple build. In service of #16043.


>---------------------------------------------------------------

cd4477c9137d6df8dfc00d66d54900d45f047af9
 testsuite/tests/safeHaskell/check/pkg01/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T
index 8574694..105ea5f 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/all.T
+++ b/testsuite/tests/safeHaskell/check/pkg01/all.T
@@ -28,7 +28,7 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn
 # and can be changed correctly
 test('safePkg01',
      [extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
-      normalise_errmsg_fun(ignoreLdOutput),
+      normalise_errmsg_fun(ignoreLdOutput, normalise_errmsg),
       normalise_version("array", "integer-gmp", "integer-simple", "bytestring",
                         "base", "deepseq", "ghc-prim")],
      run_command, ['$MAKE -s --no-print-directory safePkg01 ' + make_args])



More information about the ghc-commits mailing list