[Git][ghc/ghc][wip/andreask/tools_unlines] 2 commits: Expect T4267 to pass

[Andreas Klebinger]

Andreas Klebinger pushed to branch wip/andreask/tools_unlines at Glasgow Haskell Compiler / GHC


Commits:
f024b6e3 by Sylvain Henry at 2020-03-30T12:48:39+02:00
Expect T4267 to pass

Since 54250f2d8de910b094070c1b48f086030df634b1 we expected T4267 to
fail, but it passes on CI.

- - - - -
4a8d552c by Andreas Klebinger at 2020-03-30T16:41:48-04:00
Turn newlines into spaces for hadrian/ghci.

The newlines break the command on windows.

- - - - -


3 changed files:

- hadrian/ghci-cabal
- hadrian/ghci-stack
- testsuite/tests/perf/should_run/all.T


Changes:

=====================================
hadrian/ghci-cabal
=====================================
@@ -2,5 +2,5 @@
 
 set -e
 
-GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-cabal" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")"
+GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-cabal" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@" | tr '\n\r' ' ')"
 ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m


=====================================
hadrian/ghci-stack
=====================================
@@ -2,5 +2,5 @@
 
 set -e
 
-GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-stack" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")"
+GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-stack" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@" | tr '\n\r' ' ')"
 stack exec -- ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m


=====================================
testsuite/tests/perf/should_run/all.T
=====================================
@@ -233,8 +233,7 @@ test('T5949',
      ['-O'])
 
 test('T4267',
-     [expect_broken(4267),
-      collect_stats('bytes allocated',10),
+     [collect_stats('bytes allocated',10),
       only_ways(['normal'])],
       compile_and_run,
       ['-O'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4209209a73a4b9ff4e41a69809adb0c6e932ecc4...4a8d552c133af58f2f609513c867a44969f7c436

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4209209a73a4b9ff4e41a69809adb0c6e932ecc4...4a8d552c133af58f2f609513c867a44969f7c436
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200330/2b5c1918/attachment-0001.html>