summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorBrian Wignall <brianwignall@gmail.com>2019-12-19 09:11:42 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-01-04 15:55:06 -0500
commit3c9dc06ba2034e867c9169e60e854539875654fd (patch)
treef06e599ca380ee9ad599918b2ae4c78cd4afce2b /testsuite
parentb2e0323f318959c879629ef277f6433b44473c4b (diff)
downloadhaskell-3c9dc06ba2034e867c9169e60e854539875654fd.tar.gz
Fix typos, via a Levenshtein-style corrector
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/README.md2
-rw-r--r--testsuite/driver/testlib.py2
-rw-r--r--testsuite/driver/testutil.py2
-rw-r--r--testsuite/tests/array/should_run/arr016.hs2
-rw-r--r--testsuite/tests/callarity/unittest/CallArity1.hs2
-rw-r--r--testsuite/tests/callarity/unittest/CallArity1.stderr2
-rw-r--r--testsuite/tests/codeGen/should_run/T5785.hs2
-rw-r--r--testsuite/tests/codeGen/should_run/cgrun021.hs2
-rw-r--r--testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm2
-rw-r--r--testsuite/tests/concurrent/prog001/Trit.hs2
-rw-r--r--testsuite/tests/deSugar/should_compile/T5252.hs2
-rw-r--r--testsuite/tests/deSugar/should_compile/all.T2
-rw-r--r--testsuite/tests/deriving/should_fail/T11509_1.hs2
-rw-r--r--testsuite/tests/ffi/should_fail/ccfail003.hs2
-rw-r--r--testsuite/tests/gadt/gadt7.hs2
-rw-r--r--testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs2
-rw-r--r--testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs2
-rw-r--r--testsuite/tests/indexed-types/should_compile/Simple14.hs2
-rw-r--r--testsuite/tests/indexed-types/should_fail/Makefile2
-rw-r--r--testsuite/tests/numeric/should_run/T12136.hs2
-rw-r--r--testsuite/tests/numeric/should_run/arith018.hs2
-rw-r--r--testsuite/tests/numeric/should_run/numrun014.hs4
-rw-r--r--testsuite/tests/numeric/should_run/numrun014.stdout4
-rw-r--r--testsuite/tests/pmcheck/should_compile/T17357.hs2
-rw-r--r--testsuite/tests/programs/andy_cherry/Main.hs10
-rw-r--r--testsuite/tests/rename/should_compile/mc09.hs2
-rw-r--r--testsuite/tests/rename/should_compile/mc10.hs2
-rw-r--r--testsuite/tests/rename/should_fail/T12686.hs2
-rw-r--r--testsuite/tests/rename/should_fail/mc14.hs2
-rw-r--r--testsuite/tests/safeHaskell/check/all.T2
-rw-r--r--testsuite/tests/safeHaskell/ghci/p2.script2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/all.T2
-rw-r--r--testsuite/tests/safeHaskell/safeLanguage/all.T2
-rw-r--r--testsuite/tests/simplCore/prog003/OneShot1.hs2
-rw-r--r--testsuite/tests/simplCore/should_compile/dfun-loop.hs2
-rw-r--r--testsuite/tests/th/T11809.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/TcCustomSolverSuper.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc109.hs2
-rw-r--r--testsuite/tests/typecheck/should_compile/tc199.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail105.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail129.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/tcfail138.hs2
-rw-r--r--testsuite/tests/warnings/should_compile/all.T2
-rw-r--r--testsuite/tests/warnings/should_compile/sel_werror.hs3
-rw-r--r--testsuite/timeout/timeout.cabal2
45 files changed, 50 insertions, 53 deletions
diff --git a/testsuite/README.md b/testsuite/README.md
index 3032c73979..3f113439f9 100644
--- a/testsuite/README.md
+++ b/testsuite/README.md
@@ -14,7 +14,7 @@ Commands to run testsuite:
* Test a specific 'way': `make WAY=optllvm`
* Keeping the run directory after test run: `make CLEANUP=0`. You will find a
directory `{test_name}.run` in the test's source directory.
- * Test a specifc stage of GHC: `make stage=1`
+ * Test a specific stage of GHC: `make stage=1`
* Skip performance tests: `make SKIP_PERF_TESTS=YES`
* Set verbosity: `make VERBOSE=n`
where n=0: No per-test output, n=1: Only failures,
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 6929f7144c..228a82b942 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1185,7 +1185,7 @@ def ghci_script( name, way, script):
# script can invoke the correct compiler by using ':! $HC $HC_OPTS'
cmd = ('HC={{compiler}} HC_OPTS="{flags}" {{compiler}} {way_flags} {flags}'
).format(flags=flags, way_flags=way_flags)
- # NB: put way_flags before flags so that flags in all.T can overrie others
+ # NB: put way_flags before flags so that flags in all.T can override others
getTestOpts().stdin = script
return simple_run( name, way, cmd, getTestOpts().extra_run_opts )
diff --git a/testsuite/driver/testutil.py b/testsuite/driver/testutil.py
index 19cdbf3625..e33b6a16ab 100644
--- a/testsuite/driver/testutil.py
+++ b/testsuite/driver/testutil.py
@@ -82,7 +82,7 @@ def testing_metrics():
# are forced to just copy instead.
#
# We define the following function to make this magic more
-# explicit/discoverable. You are enouraged to use it instead of os.symlink.
+# explicit/discoverable. You are encouraged to use it instead of os.symlink.
if platform.system() == 'Windows' and os.getenv('FORCE_SYMLINKS') == None:
def link_or_copy_file(src: Path, dst: Path):
shutil.copyfile(str(src), str(dst))
diff --git a/testsuite/tests/array/should_run/arr016.hs b/testsuite/tests/array/should_run/arr016.hs
index 792db470b7..72a29c4f09 100644
--- a/testsuite/tests/array/should_run/arr016.hs
+++ b/testsuite/tests/array/should_run/arr016.hs
@@ -122,7 +122,7 @@ rift n xs = comb (drop n xs) (take n xs)
comb [] [] = []
--- suffle makes n random rifts. Typically after
+-- shuffle makes n random rifts. Typically after
-- log n rifts, the list is in a pretty random order.
-- (where n is the number of elements in the list)
diff --git a/testsuite/tests/callarity/unittest/CallArity1.hs b/testsuite/tests/callarity/unittest/CallArity1.hs
index 00583d0209..3b74aeaa7e 100644
--- a/testsuite/tests/callarity/unittest/CallArity1.hs
+++ b/testsuite/tests/callarity/unittest/CallArity1.hs
@@ -121,7 +121,7 @@ exprs =
mkRLet go (mkLams [x] (mkACase (mkLams [y] $ mkLit 0) (Var go `mkVarApps` [x]))) $
mkRLet go2 (mkLams [x] (mkACase (mkLams [y] $ mkLit 0) (Var go2 `mkVarApps` [x]))) $
Var go `mkApps` [go2 `mkLApps` [0,1], mkLit 0]
- , ("mutual recursion (thunks), called mutiple times (both arity 1 would be bad!)",) $
+ , ("mutual recursion (thunks), called multiple times (both arity 1 would be bad!)",) $
Let (Rec [ (n, mkACase (mkLams [y] $ mkLit 0) (Var d))
, (d, mkACase (mkLams [y] $ mkLit 0) (Var n))]) $
Var n `mkApps` [Var d `mkApps` [Var d `mkApps` [mkLit 0]]]
diff --git a/testsuite/tests/callarity/unittest/CallArity1.stderr b/testsuite/tests/callarity/unittest/CallArity1.stderr
index 82cbc2ba01..754ac777a4 100644
--- a/testsuite/tests/callarity/unittest/CallArity1.stderr
+++ b/testsuite/tests/callarity/unittest/CallArity1.stderr
@@ -44,7 +44,7 @@ a function, one called multiple times via a forking recursion:
two functions (recursive):
go 2
go2 2
-mutual recursion (thunks), called mutiple times (both arity 1 would be bad!):
+mutual recursion (thunks), called multiple times (both arity 1 would be bad!):
d 0
n 0
mutual recursion (functions), but no thunks:
diff --git a/testsuite/tests/codeGen/should_run/T5785.hs b/testsuite/tests/codeGen/should_run/T5785.hs
index 1b27f10a15..e8dda7e9b6 100644
--- a/testsuite/tests/codeGen/should_run/T5785.hs
+++ b/testsuite/tests/codeGen/should_run/T5785.hs
@@ -28,7 +28,7 @@ main = do
print (2316287658 :: Int32)
print (2316287658 :: Int64)
- -- this requries a 64 (unsigned) bit word to store correctly
+ -- this requires a 64 (unsigned) bit word to store correctly
print (32342316287658 :: Word8)
print (32342316287658 :: Word16)
print (32342316287658 :: Word32)
diff --git a/testsuite/tests/codeGen/should_run/cgrun021.hs b/testsuite/tests/codeGen/should_run/cgrun021.hs
index bf7b404652..4f750aec08 100644
--- a/testsuite/tests/codeGen/should_run/cgrun021.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun021.hs
@@ -5,7 +5,7 @@
The mutual recursion between munch and f causes lots of
closures to be built, of the form (munch n s), for some n and s.
Now, all of these closures are entered and each has as its value
- the result delivere by the next; so the result is that there is
+ the result delivered by the next; so the result is that there is
a massive chain of identical updates.
As it turns out, they are mostly garbage, so the GC could eliminate
diff --git a/testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm b/testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm
index 13a26aa012..006595e319 100644
--- a/testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm
+++ b/testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm
@@ -7,7 +7,7 @@ section "rodata" { memsetErr : bits8[] "Memset Error - align: %d size: %d\n"; }
section "rodata" { memcpyErr : bits8[] "Memcpy Error - align: %d size: %d\n"; }
// You have to call printf with the same number of args for every call.
// This is as the LLVM backend doesn't support vararg functions.
-section "rodata" { memmoveErr : bits8[] "Memmove Error Occured\n"; }
+section "rodata" { memmoveErr : bits8[] "Memmove Error Occurred\n"; }
memintrinTest (W_ dummy)
{
diff --git a/testsuite/tests/concurrent/prog001/Trit.hs b/testsuite/tests/concurrent/prog001/Trit.hs
index c42fe6d4cf..8674d6510b 100644
--- a/testsuite/tests/concurrent/prog001/Trit.hs
+++ b/testsuite/tests/concurrent/prog001/Trit.hs
@@ -55,7 +55,7 @@ addTrits (m1, (x1:x2:xs)) (m2, (y1:y2:ys)) = (u,addStream (x1:x2:xs) (y1:y2:ys))
--- Substraction of 2 Trits
+-- Subtraction of 2 Trits
subTrits :: Trit -> Trit -> Trit
subTrits x y = addTrits x (neg y)
diff --git a/testsuite/tests/deSugar/should_compile/T5252.hs b/testsuite/tests/deSugar/should_compile/T5252.hs
index ec7399d3cf..dc4c8fed45 100644
--- a/testsuite/tests/deSugar/should_compile/T5252.hs
+++ b/testsuite/tests/deSugar/should_compile/T5252.hs
@@ -1,5 +1,5 @@
-- #5252
--- Killed 7.03 when compiled witout -O,
+-- Killed 7.03 when compiled without -O,
-- because it could not see that x had a product type
-- but MkS still unpacked it
diff --git a/testsuite/tests/deSugar/should_compile/all.T b/testsuite/tests/deSugar/should_compile/all.T
index 21cf1b058d..f72a854045 100644
--- a/testsuite/tests/deSugar/should_compile/all.T
+++ b/testsuite/tests/deSugar/should_compile/all.T
@@ -81,7 +81,7 @@ test('T5252', [], makefile_test, [])
test('T5455', normal, compile, [''])
test('T5001', [only_ways(['optasm'])], multimod_compile, ['T5001', '-v0'])
-# T5252Take2 failed when compiled *wihtout* optimisation
+# T5252Take2 failed when compiled *without* optimisation
test('T5252Take2', [], makefile_test, [])
test('T2431', normal, compile, ['-ddump-simpl -dsuppress-uniques'])
test('T7669', normal, compile, [''])
diff --git a/testsuite/tests/deriving/should_fail/T11509_1.hs b/testsuite/tests/deriving/should_fail/T11509_1.hs
index d684e64fc9..ee088c3876 100644
--- a/testsuite/tests/deriving/should_fail/T11509_1.hs
+++ b/testsuite/tests/deriving/should_fail/T11509_1.hs
@@ -17,7 +17,7 @@ import GHC.StaticPtr
{-------------------------------------------------------------------------------
Standard Cloud-Haskell-like infrastructure
- See <https://gitlab.haskell.org/ghc/ghc/wikis/typeable-t> for a dicussion of 'SC'.
+ See <https://gitlab.haskell.org/ghc/ghc/wikis/typeable-t> for a discussion of 'SC'.
-------------------------------------------------------------------------------}
class Serializable a -- empty class, just for demonstration purposes
diff --git a/testsuite/tests/ffi/should_fail/ccfail003.hs b/testsuite/tests/ffi/should_fail/ccfail003.hs
index 339d629dd9..36ccf968b5 100644
--- a/testsuite/tests/ffi/should_fail/ccfail003.hs
+++ b/testsuite/tests/ffi/should_fail/ccfail003.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE UnliftedFFITypes, MagicHash #-}
--- !!! illegal types in foreign export delarations
+-- !!! illegal types in foreign export declarations
module ShouldFail where
import GHC.Exts
diff --git a/testsuite/tests/gadt/gadt7.hs b/testsuite/tests/gadt/gadt7.hs
index 105b60c807..5559cb82d3 100644
--- a/testsuite/tests/gadt/gadt7.hs
+++ b/testsuite/tests/gadt/gadt7.hs
@@ -12,7 +12,7 @@ i1 :: T a -> a -> Int
i1 t y = (\t1 y1 -> case t1 of K -> y1) t y
-- No type signature; should not type-check,
--- because we can't unify under the equalty constraint for K
+-- because we can't unify under the equality constraint for K
i1b t y = (\t1 y1 -> case t1 of K -> y1) t y
i2 :: T a -> a -> Int
diff --git a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
index 335963be4e..754236a540 100644
--- a/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
+++ b/testsuite/tests/ghc-api/downsweep/PartialDownsweep.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE ScopedTypeVariables, ViewPatterns #-}
--- | This test checks if 'downsweep can return partial results when vaious
+-- | This test checks if 'downsweep can return partial results when various
-- kinds of parse errors occur in modules.
import GHC
diff --git a/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs
index 0e6e871215..cdd2bdce74 100644
--- a/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs
@@ -32,7 +32,7 @@ postInlineUnconditionally
-- in \y. ....case f of {...} ....
-- Here f is used just once, and duplicating the case work is fine (exprIsCheap).
-- But
--- * We can't preInlineUnconditionally because that woud invalidate
+-- * We can't preInlineUnconditionally because that would invalidate
-- the occ info for b.
-- * We can't postInlineUnconditionally because the RHS is big, and
-- that risks exponential behaviour
diff --git a/testsuite/tests/indexed-types/should_compile/Simple14.hs b/testsuite/tests/indexed-types/should_compile/Simple14.hs
index b8e002bdcd..0a47a649a5 100644
--- a/testsuite/tests/indexed-types/should_compile/Simple14.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple14.hs
@@ -21,5 +21,5 @@ foo = ntI (`eqE` (eqI :: EQ_ m n))
-- eq :: EQ_ (Maybe m) (Maybe n)
-- Need (Maybe m ~ Maybe n) => EQ_ m n ~ EQ_ zeta zeta
--- which redues to (m~n) => m ~ zeta
+-- which reduces to (m~n) => m ~ zeta
-- but then we are stuck \ No newline at end of file
diff --git a/testsuite/tests/indexed-types/should_fail/Makefile b/testsuite/tests/indexed-types/should_fail/Makefile
index 432003c9df..78a7c219a9 100644
--- a/testsuite/tests/indexed-types/should_fail/Makefile
+++ b/testsuite/tests/indexed-types/should_fail/Makefile
@@ -11,7 +11,7 @@ T8227:
-'$(TEST_HC)' $(TEST_HC_OPTS) -c T8227.hs
# T8129 is trying to ensure that we don't get an
-# an asertion failure with -ddump-tc-trace
+# an assertion failure with -ddump-tc-trace
T8129:
-'$(TEST_HC)' $(TEST_HC_OPTS) -c -ddump-tc-trace T8129.hs 2> T8129.trace > T8129.trace
grep -a deduce T8129.trace
diff --git a/testsuite/tests/numeric/should_run/T12136.hs b/testsuite/tests/numeric/should_run/T12136.hs
index 1f967a84bd..999ffa02bf 100644
--- a/testsuite/tests/numeric/should_run/T12136.hs
+++ b/testsuite/tests/numeric/should_run/T12136.hs
@@ -15,5 +15,5 @@ negativeBigInteger :: Integer
negativeBigInteger = 1 - (1 `shiftL` (64 * 2))
main = do
- -- rigt shift by GMP_LIMB_BITS
+ -- right shift by GMP_LIMB_BITS
print $ negativeBigInteger `shiftR` 64
diff --git a/testsuite/tests/numeric/should_run/arith018.hs b/testsuite/tests/numeric/should_run/arith018.hs
index b73fd5a685..83c822ef3a 100644
--- a/testsuite/tests/numeric/should_run/arith018.hs
+++ b/testsuite/tests/numeric/should_run/arith018.hs
@@ -1,5 +1,5 @@
-- exposes a bug in the native code generator in GHC 6.4.1. Division by
--- a power of 2 was being mis-optimsed to a direct shift.
+-- a power of 2 was being mis-optimised to a direct shift.
main = do
print (map f4 [(-20) .. (-1)])
diff --git a/testsuite/tests/numeric/should_run/numrun014.hs b/testsuite/tests/numeric/should_run/numrun014.hs
index 207e7663c0..34a316e789 100644
--- a/testsuite/tests/numeric/should_run/numrun014.hs
+++ b/testsuite/tests/numeric/should_run/numrun014.hs
@@ -69,7 +69,7 @@ main = do putStrLn "=== Subtraction ==="
print (neginf + nan)
print (neginf + inf)
print (neginf + neginf)
- putStrLn "=== Mutiplication ==="
+ putStrLn "=== Multiplication ==="
print (zero * zero)
print (zero * one)
print (zero * nan)
@@ -156,7 +156,7 @@ main = do putStrLn "=== Subtraction ==="
print (fneginf + fnan)
print (fneginf + finf)
print (fneginf + fneginf)
- putStrLn "=== Mutiplication ==="
+ putStrLn "=== Multiplication ==="
print (fzero * fzero)
print (fzero * fone)
print (fzero * fnan)
diff --git a/testsuite/tests/numeric/should_run/numrun014.stdout b/testsuite/tests/numeric/should_run/numrun014.stdout
index 3bcfad620d..82df93f5b0 100644
--- a/testsuite/tests/numeric/should_run/numrun014.stdout
+++ b/testsuite/tests/numeric/should_run/numrun014.stdout
@@ -32,7 +32,7 @@ NaN
NaN
NaN
-Infinity
-=== Mutiplication ===
+=== Multiplication ===
0.0
0.0
NaN
@@ -118,7 +118,7 @@ NaN
NaN
NaN
-Infinity
-=== Mutiplication ===
+=== Multiplication ===
0.0
0.0
NaN
diff --git a/testsuite/tests/pmcheck/should_compile/T17357.hs b/testsuite/tests/pmcheck/should_compile/T17357.hs
index db1b0ab4fd..a27f52c31f 100644
--- a/testsuite/tests/pmcheck/should_compile/T17357.hs
+++ b/testsuite/tests/pmcheck/should_compile/T17357.hs
@@ -35,7 +35,7 @@ pattern T <- (const True -> True)
{-# COMPLETE T, F :: Void #-}
-- | But we consider COMPLETE signatures to cover bottom. Hence the last clause
--- here should be redunant, not inaccessible RHS.
+-- here should be redundant, not inaccessible RHS.
f3 :: Void -> ()
f3 T = ()
f3 F = ()
diff --git a/testsuite/tests/programs/andy_cherry/Main.hs b/testsuite/tests/programs/andy_cherry/Main.hs
index f4b2ed827e..1fbe347faf 100644
--- a/testsuite/tests/programs/andy_cherry/Main.hs
+++ b/testsuite/tests/programs/andy_cherry/Main.hs
@@ -105,19 +105,19 @@
-> String -- result
prog OutputPGN _
= pgnPrinter True -- print out game(s)
- . map runInterp -- interprete all games
+ . map runInterp -- interpret all games
prog OutputRawPGN _
= pgnPrinter False -- print out game(s)
- . map runInterp -- interprete all games
+ . map runInterp -- interpret all games
prog OutputHeader _
= pgnHeadPrinter -- print out game(s) headers
- . map runInterp -- interprete all games
+ . map runInterp -- interpret all games
prog OutputTEX _
= texPrinter -- print out game(s)
- . map runInterp -- interprete all games
+ . map runInterp -- interpret all games
prog ViewGame std_in
= interactViewer std_in -- print out game(s)
- . runInterp -- interprete the game
+ . runInterp -- interpret the game
. head -- should check for only *one* object
prog OutputParser _
= userFormat
diff --git a/testsuite/tests/rename/should_compile/mc09.hs b/testsuite/tests/rename/should_compile/mc09.hs
index f4a62fa617..1e1f2819b5 100644
--- a/testsuite/tests/rename/should_compile/mc09.hs
+++ b/testsuite/tests/rename/should_compile/mc09.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE MonadComprehensions, TransformListComp #-}
--- Test performed for TransformListComp and should work for monad comp aswell:
+-- Test performed for TransformListComp and should work for monad comp as well:
-- GHC 7.0.1 failed because the renamer didn't attach
-- all the used variables to the TransformListComp constructor
diff --git a/testsuite/tests/rename/should_compile/mc10.hs b/testsuite/tests/rename/should_compile/mc10.hs
index fa9774fdfb..e1a4f81e25 100644
--- a/testsuite/tests/rename/should_compile/mc10.hs
+++ b/testsuite/tests/rename/should_compile/mc10.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fwarn-unused-matches #-}
{-# LANGUAGE MonadComprehensions, ParallelListComp #-}
--- Test for parallel list comp should work for monad comp aswell:
+-- Test for parallel list comp should work for monad comp as well:
--
-- GHC 6.4 erroneously reported that the
-- bindings for q and z were unused
diff --git a/testsuite/tests/rename/should_fail/T12686.hs b/testsuite/tests/rename/should_fail/T12686.hs
index 5d652f9c57..a9d0da9aa1 100644
--- a/testsuite/tests/rename/should_fail/T12686.hs
+++ b/testsuite/tests/rename/should_fail/T12686.hs
@@ -5,7 +5,7 @@ import Data.Proxy
x = True
data Bad = Bad 'x
--- The 'x should be rejeted in a civilised way
+-- The 'x should be rejected in a civilised way
data AlsoBad = AlsoBad {
a :: Int,
diff --git a/testsuite/tests/rename/should_fail/mc14.hs b/testsuite/tests/rename/should_fail/mc14.hs
index 47d903b922..80bea39e7e 100644
--- a/testsuite/tests/rename/should_fail/mc14.hs
+++ b/testsuite/tests/rename/should_fail/mc14.hs
@@ -1,4 +1,4 @@
--- Test for transform list comp which should work for monad comp aswell:
+-- Test for transform list comp which should work for monad comp as well:
--
-- Test trying to use a function bound in the list comprehension as the group function
diff --git a/testsuite/tests/safeHaskell/check/all.T b/testsuite/tests/safeHaskell/check/all.T
index 8cf37d3b43..ae836fba31 100644
--- a/testsuite/tests/safeHaskell/check/all.T
+++ b/testsuite/tests/safeHaskell/check/all.T
@@ -31,7 +31,7 @@ test('Check03', normal, multi_compile, ['Check03', [
], '-fpackage-trust'])
# Check a slightly larger transitive program. Check01 isn't imported
-# safely by Check03 so we don't require base trused at end.
+# safely by Check03 so we don't require base trusted at end.
test('Check04', normal, multi_compile, ['Check04', [
('Check04_A.hs', ''),
('Check04_B.hs', '-trust base'),
diff --git a/testsuite/tests/safeHaskell/ghci/p2.script b/testsuite/tests/safeHaskell/ghci/p2.script
index 19133c7b13..188915579e 100644
--- a/testsuite/tests/safeHaskell/ghci/p2.script
+++ b/testsuite/tests/safeHaskell/ghci/p2.script
@@ -3,7 +3,7 @@
:unset +s
:set -XSafe
--- we actually allow this for now but may want to revist this decision
+-- we actually allow this for now but may want to revisit this decision
-- (as in, given we are in -XSafe, we may not want to allow package trust
-- flags to be changed...)
:set -trust base
diff --git a/testsuite/tests/safeHaskell/safeInfered/all.T b/testsuite/tests/safeHaskell/safeInfered/all.T
index e9b03b5458..87fe5778a5 100644
--- a/testsuite/tests/safeHaskell/safeInfered/all.T
+++ b/testsuite/tests/safeHaskell/safeInfered/all.T
@@ -61,7 +61,7 @@ test('UnsafeWarn05', normal, compile, [''])
test('UnsafeWarn06', normal, compile, [''])
test('UnsafeWarn07', normal, compile, [''])
-# Chck -fwa-safe works
+# Check -fwa-safe works
test('SafeWarn01', normal, compile, [''])
test('T16689', normal, compile, ['-Wsafe'])
diff --git a/testsuite/tests/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T
index dc38031b28..de4a9b6908 100644
--- a/testsuite/tests/safeHaskell/safeLanguage/all.T
+++ b/testsuite/tests/safeHaskell/safeLanguage/all.T
@@ -1,7 +1,7 @@
# safeLanguage tests are all about making sure the correct
# unsafe language extensions are disabled or restricted
# in the -XSafe language. Basically testing that -XSafe
-# works correctly (incluidng testing safe imports a little).
+# works correctly (including testing safe imports a little).
# Just do the normal way, SafeHaskell is all in the frontend
def f( name, opts ):
diff --git a/testsuite/tests/simplCore/prog003/OneShot1.hs b/testsuite/tests/simplCore/prog003/OneShot1.hs
index 3f6589acd1..f24a830858 100644
--- a/testsuite/tests/simplCore/prog003/OneShot1.hs
+++ b/testsuite/tests/simplCore/prog003/OneShot1.hs
@@ -5,7 +5,7 @@ import GHC.Base
-- This oneShot is a lie, and together with unsafePerformIO (in the form of
-- trace) in OneShot2, we can observe the difference.
--- Two modules to ensure that oneShot annotations surive interface files, both
+-- Two modules to ensure that oneShot annotations survive interface files, both
-- in explicits unfoldings (foo) and in unannotated functions (baz)
foo :: Int -> Int -> Int
diff --git a/testsuite/tests/simplCore/should_compile/dfun-loop.hs b/testsuite/tests/simplCore/should_compile/dfun-loop.hs
index 4ad23f3401..20f338bd1b 100644
--- a/testsuite/tests/simplCore/should_compile/dfun-loop.hs
+++ b/testsuite/tests/simplCore/should_compile/dfun-loop.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE TypeFamilies, FlexibleContexts #-}
-- This one sent an earlier version of GHC into a
--- loop in the simplfier, because we allowed a RULE
+-- loop in the simplifier, because we allowed a RULE
-- to fire on a loop-breaker
--
-- Discovered by Roman L, Nov 09
diff --git a/testsuite/tests/th/T11809.hs b/testsuite/tests/th/T11809.hs
index bbb65fa83b..94b6368b7b 100644
--- a/testsuite/tests/th/T11809.hs
+++ b/testsuite/tests/th/T11809.hs
@@ -10,4 +10,4 @@ module T11809 where
getD = unD someD -- unD should resolve to the record selector above!
|]
-getD' = unD someD -- dito here outside of the splice!
+getD' = unD someD -- ditto here outside of the splice!
diff --git a/testsuite/tests/typecheck/should_compile/TcCustomSolverSuper.hs b/testsuite/tests/typecheck/should_compile/TcCustomSolverSuper.hs
index b5e20be448..6b243bda96 100644
--- a/testsuite/tests/typecheck/should_compile/TcCustomSolverSuper.hs
+++ b/testsuite/tests/typecheck/should_compile/TcCustomSolverSuper.hs
@@ -17,7 +17,7 @@ we got this right.
PS: this test used to have Typeable in the context too, but
that's a redundant constraint, so I removed it
-PPS: the whole structre of tcSuperClasses has changed,
+PPS: the whole structure of tcSuperClasses has changed,
so I'm no longer sure what is being tested here
-}
diff --git a/testsuite/tests/typecheck/should_compile/tc109.hs b/testsuite/tests/typecheck/should_compile/tc109.hs
index 2a08caea08..7aa66cf02c 100644
--- a/testsuite/tests/typecheck/should_compile/tc109.hs
+++ b/testsuite/tests/typecheck/should_compile/tc109.hs
@@ -15,6 +15,6 @@ instance (P a,R a b) => P [b]
{- GHC 4.08.1 doesn't seem to allow variables in the context that
don't appear after the =>, but which are still ok since they are
-determined by the functional dependenices. -}
+determined by the functional dependencies. -}
diff --git a/testsuite/tests/typecheck/should_compile/tc199.hs b/testsuite/tests/typecheck/should_compile/tc199.hs
index 4e65358aa0..73df16f68c 100644
--- a/testsuite/tests/typecheck/should_compile/tc199.hs
+++ b/testsuite/tests/typecheck/should_compile/tc199.hs
@@ -5,7 +5,7 @@
-- Hence needing AllowAmbiguousTypes
--
-- However, arguably the instance declaration should be accepted,
--- beause it's equivalent to
+-- because it's equivalent to
-- instance Baz Int Int where { foo x = x }
-- which *does* typecheck
diff --git a/testsuite/tests/typecheck/should_fail/tcfail105.hs b/testsuite/tests/typecheck/should_fail/tcfail105.hs
index b0efc5b424..68d88b8961 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail105.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail105.hs
@@ -2,7 +2,7 @@
-- Existential context should quantify over some new type variables
--
--- Jan07: this is now fine, because we've lifted the restrction
+-- Jan07: this is now fine, because we've lifted the restriction
-- that the context on a constructor should mention
-- existential type variables
diff --git a/testsuite/tests/typecheck/should_fail/tcfail129.hs b/testsuite/tests/typecheck/should_fail/tcfail129.hs
index 1a74749f56..271bd52715 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail129.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail129.hs
@@ -1,6 +1,6 @@
-- Both blocks are illegal Haskell 98, because of the un-saturated
-- type synonym, but (rather obscurely) at one point (GHC 6.3), we
--- acceped 'blah', but rejected 'blah1'
+-- accepted 'blah', but rejected 'blah1'
module ShouldFail where
diff --git a/testsuite/tests/typecheck/should_fail/tcfail138.hs b/testsuite/tests/typecheck/should_fail/tcfail138.hs
index 1c628a1b5b..be21d5f84c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail138.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail138.hs
@@ -3,7 +3,7 @@
FlexibleInstances, UndecidableInstances #-}
-- UndecidableInstances because (L a b) is no smaller than (C a b)
--- This one shows up another rather subtle functional-dependecy
+-- This one shows up another rather subtle functional-dependency
-- case. The error is:
--
-- Could not deduce (C a b') from the context (C a b)
diff --git a/testsuite/tests/warnings/should_compile/all.T b/testsuite/tests/warnings/should_compile/all.T
index 914f4514d3..03c4fcb7b8 100644
--- a/testsuite/tests/warnings/should_compile/all.T
+++ b/testsuite/tests/warnings/should_compile/all.T
@@ -2,7 +2,7 @@
test('T2526', normal, compile, ['-fwarn-missing-signatures -fwarn-missing-exported-signatures'])
test('T9178', [], multimod_compile, ['T9178', '-Wall'])
-# T9230.hs contains a tab charater. Test that -Wtabs is enabled by default.
+# T9230.hs contains a tab character. Test that -Wtabs is enabled by default.
test('T9230', normal, compile, [''])
test('T10908', normal, compile, [''])
diff --git a/testsuite/tests/warnings/should_compile/sel_werror.hs b/testsuite/tests/warnings/should_compile/sel_werror.hs
deleted file mode 100644
index 65702539ad..0000000000
--- a/testsuite/tests/warnings/should_compile/sel_werror.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-{-# OPTIONS_GHC -Wwarn-missing-signatues -Werror=incomplete-patterns #-}
-
-foo () = ()
diff --git a/testsuite/timeout/timeout.cabal b/testsuite/timeout/timeout.cabal
index c44eadf02d..0ada69b43f 100644
--- a/testsuite/timeout/timeout.cabal
+++ b/testsuite/timeout/timeout.cabal
@@ -4,7 +4,7 @@ Copyright: GHC Team
License: BSD3
Author: GHC Team <cvs-ghc@haskell.org>
Maintainer: GHC Team <cvs-ghc@haskell.org>
-Synopsis: timout utility
+Synopsis: timeout utility
Description: timeout utility
Category: Development
build-type: Simple