[commit: ghc] ghc-8.0: Testsuite: delete Windows line endings [skip ci] (#11631) (18a921b)
git at git.haskell.org
git at git.haskell.org
Sat Feb 27 14:39:57 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/18a921b81abfeee29dfd4ca35711f72de8aa5d5b/ghc
>---------------------------------------------------------------
commit 18a921b81abfeee29dfd4ca35711f72de8aa5d5b
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Mon Feb 22 21:32:51 2016 +0100
Testsuite: delete Windows line endings [skip ci] (#11631)
(cherry picked from commit 6d0aa9ffc094ec69f1fbd7f9e15bcf7535e3370b)
>---------------------------------------------------------------
18a921b81abfeee29dfd4ca35711f72de8aa5d5b
libraries/base/tests/IO/hGetLine001.stdout | 16 ++++++++--------
libraries/base/tests/IO/hReady002.stdout | 0
libraries/base/tests/IO/openFile003.stdout-mingw32 | 0
.../tests/Numeric/num009.stdout-i386-unknown-mingw32 | 0
testsuite/tests/arrows/should_fail/arrowfail002.stderr | 0
testsuite/tests/cabal/cabal01/cabal01.stdout-mingw32 | 0
testsuite/tests/concurrent/should_run/conc041.stdout | 0
testsuite/tests/concurrent/should_run/conc042.stdout | 0
testsuite/tests/concurrent/should_run/conc043.stdout | 0
testsuite/tests/concurrent/should_run/conc044.stdout | 0
testsuite/tests/concurrent/should_run/conc045.stdout | 0
testsuite/tests/deSugar/should_run/T3382.stdout | 0
testsuite/tests/deriving/should_fail/T2604.stderr-7.0 | 11 -----------
testsuite/tests/deriving/should_fail/T9968a.stderr | 0
testsuite/tests/deriving/should_fail/drvfail006.stderr | 0
testsuite/tests/deriving/should_run/T4136.stdout | 0
testsuite/tests/deriving/should_run/drvrun019.stdout | 0
testsuite/tests/ffi/should_run/T1288_c.c | 0
testsuite/tests/ffi/should_run/T1288_ghci_c.c | 0
testsuite/tests/ffi/should_run/T2276_c.c | 0
testsuite/tests/ffi/should_run/T2276_ghci_c.c | 0
testsuite/tests/ffi/should_run/ffi012.stdout | 0
testsuite/tests/ffi/should_run/ffi014_cbits.c | 0
testsuite/tests/ffi/should_run/ffi014_cbits.h | 0
testsuite/tests/gadt/T3163.stderr | 0
testsuite/tests/generics/T5462Yes1.stdout | 0
testsuite/tests/ghc-api/annotations/T10278.stderr | 0
testsuite/tests/ghci.debugger/scripts/print026.stdout | 0
testsuite/tests/ghci/prog012/prog012.stderr | 0
testsuite/tests/ghci/scripts/T11098.script | 0
testsuite/tests/ghci/scripts/T2816.stderr | 0
testsuite/tests/ghci/scripts/T4127.script | 0
testsuite/tests/ghci/scripts/T4127a.script | 0
testsuite/tests/ghci/scripts/T5566.stdout | 0
testsuite/tests/ghci/scripts/ghci019.script | 0
testsuite/tests/ghci/scripts/ghci023.ghci | 0
testsuite/tests/ghci/scripts/ghci038.stderr | 0
testsuite/tests/ghci/scripts/ghci044.stdout | 0
.../tests/indexed-types/should_compile/T11361a.stderr | 0
.../tests/indexed-types/should_fail/SimpleFail15.stderr | 0
testsuite/tests/indexed-types/should_fail/T10899.stderr | 0
testsuite/tests/indexed-types/should_fail/T11136.stderr | 0
testsuite/tests/mdo/should_run/mdorun003.stdout | 0
testsuite/tests/module/mod110.stderr | 0
testsuite/tests/module/mod120.stderr | 0
testsuite/tests/module/mod138.stderr | 0
testsuite/tests/module/mod151.stderr | 0
testsuite/tests/module/mod152.stderr | 0
testsuite/tests/module/mod153.stderr | 0
testsuite/tests/module/mod158.stderr | 0
testsuite/tests/module/mod48.stderr | 0
testsuite/tests/module/mod98.stderr | 0
.../tests/parser/should_fail/NoPatternSynonyms.stderr | 0
testsuite/tests/parser/should_fail/T3811.stderr | 0
testsuite/tests/parser/should_fail/readFail001.stderr | 0
testsuite/tests/parser/should_fail/readFail031.stderr | 0
testsuite/tests/parser/should_fail/readFail042.stderr | 0
testsuite/tests/parser/should_fail/readFail043.stderr | 0
testsuite/tests/parser/unicode/T2302.stderr | 0
.../tests/partial-sigs/should_compile/T10519.stderr | 0
.../ExtraConstraintsWildcardInTypeSplice2.stderr | 0
.../ExtraConstraintsWildcardNotEnabled.stderr | 0
.../should_fail/ExtraConstraintsWildcardNotLast.stderr | 0
.../should_fail/ExtraConstraintsWildcardTwice.stderr | 0
.../should_fail/NamedWildcardInTypeSplice.stderr | 0
.../should_fail/NestedExtraConstraintsWildcard.stderr | 0
.../NestedNamedExtraConstraintsWildcard.stderr | 0
.../should_fail/PartialClassMethodSignature.stderr | 0
.../should_fail/PartialClassMethodSignature2.stderr | 0
.../should_fail/UnnamedConstraintWildcard1.stderr | 0
.../should_fail/UnnamedConstraintWildcard2.stderr | 0
.../tests/partial-sigs/should_fail/WildcardInADT1.stderr | 0
.../tests/partial-sigs/should_fail/WildcardInADT2.stderr | 0
.../tests/partial-sigs/should_fail/WildcardInADT3.stderr | 0
.../should_fail/WildcardInADTContext1.stderr | 0
.../should_fail/WildcardInADTContext2.stderr | 0
.../partial-sigs/should_fail/WildcardInDefault.stderr | 0
.../should_fail/WildcardInDefaultSignature.stderr | 0
.../partial-sigs/should_fail/WildcardInDeriving.stderr | 0
.../should_fail/WildcardInForeignExport.stderr | 0
.../should_fail/WildcardInForeignImport.stderr | 0
.../partial-sigs/should_fail/WildcardInGADT1.stderr | 0
.../partial-sigs/should_fail/WildcardInGADT2.stderr | 0
.../should_fail/WildcardInInstanceHead.stderr | 0
.../should_fail/WildcardInInstanceSig.stderr | 0
.../partial-sigs/should_fail/WildcardInNewtype.stderr | 0
.../partial-sigs/should_fail/WildcardInPatSynSig.stderr | 0
.../should_fail/WildcardInStandaloneDeriving.stderr | 0
.../should_fail/WildcardInTypeFamilyInstanceRHS.stderr | 0
.../should_fail/WildcardInTypeSynonymRHS.stderr | 0
90 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/libraries/base/tests/IO/hGetLine001.stdout b/libraries/base/tests/IO/hGetLine001.stdout
index 3e023db..ab88bf0 100644
--- a/libraries/base/tests/IO/hGetLine001.stdout
+++ b/libraries/base/tests/IO/hGetLine001.stdout
@@ -5,8 +5,8 @@ import System.IO
-- one version of 'cat'
main = do
let loop h = do b <- hIsEOF h
- if b then return ()
- else do l <- hGetLine h; putStrLn l; loop h
+ if b then return ()
+ else do l <- hGetLine h; putStrLn l; loop h
loop stdin
h <- openFile "hGetLine001.hs" ReadMode
@@ -30,8 +30,8 @@ import System.IO
-- one version of 'cat'
main = do
let loop h = do b <- hIsEOF h
- if b then return ()
- else do l <- hGetLine h; putStrLn l; loop h
+ if b then return ()
+ else do l <- hGetLine h; putStrLn l; loop h
loop stdin
h <- openFile "hGetLine001.hs" ReadMode
@@ -55,8 +55,8 @@ import System.IO
-- one version of 'cat'
main = do
let loop h = do b <- hIsEOF h
- if b then return ()
- else do l <- hGetLine h; putStrLn l; loop h
+ if b then return ()
+ else do l <- hGetLine h; putStrLn l; loop h
loop stdin
h <- openFile "hGetLine001.hs" ReadMode
@@ -80,8 +80,8 @@ import System.IO
-- one version of 'cat'
main = do
let loop h = do b <- hIsEOF h
- if b then return ()
- else do l <- hGetLine h; putStrLn l; loop h
+ if b then return ()
+ else do l <- hGetLine h; putStrLn l; loop h
loop stdin
h <- openFile "hGetLine001.hs" ReadMode
diff --git a/testsuite/tests/deriving/should_fail/T2604.stderr-7.0 b/testsuite/tests/deriving/should_fail/T2604.stderr-7.0
deleted file mode 100644
index aa996e0..0000000
--- a/testsuite/tests/deriving/should_fail/T2604.stderr-7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-
-T2604.hs:7:35:
- Can't make a derived instance of `Typeable (DList a)':
- You need -XDeriveDataTypeable to derive an instance for this class
- In the data type declaration for `DList'
-
-T2604.hs:9:38:
- Can't make a derived instance of `Typeable (NList a)'
- (even with cunning newtype deriving):
- You need -XDeriveDataTypeable to derive an instance for this class
- In the newtype declaration for `NList'
More information about the ghc-commits
mailing list