summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorBrian Wignall <brianwignall@gmail.com>2019-11-29 14:25:14 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-12-02 03:44:16 -0500
commit717f323609857a40fdbefe7a5ba426747512414a (patch)
treedaa6c5cb93d35ac3b13e02f72484e87ca6e4aa3f /testsuite/tests
parent18baed641fccc7fd91988334544d47505b577810 (diff)
downloadhaskell-717f323609857a40fdbefe7a5ba426747512414a.tar.gz
Fix more typos
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/programs/Makefile-OLD2
-rw-r--r--testsuite/tests/programs/andy_cherry/Interp.hs2
-rw-r--r--testsuite/tests/safeHaskell/flags/SafeFlags22.hs2
-rw-r--r--testsuite/tests/safeHaskell/flags/SafeFlags23.hs2
-rw-r--r--testsuite/tests/safeHaskell/flags/SafeFlags24.hs2
-rw-r--r--testsuite/tests/safeHaskell/flags/SafeFlags25.hs2
-rw-r--r--testsuite/tests/safeHaskell/flags/SafeFlags26.hs2
-rw-r--r--testsuite/tests/safeHaskell/safeInfered/all.T4
-rw-r--r--testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs2
9 files changed, 10 insertions, 10 deletions
diff --git a/testsuite/tests/programs/Makefile-OLD b/testsuite/tests/programs/Makefile-OLD
index 0fab32f683..c6d37fe912 100644
--- a/testsuite/tests/programs/Makefile-OLD
+++ b/testsuite/tests/programs/Makefile-OLD
@@ -29,7 +29,7 @@ NOT_THESE += jeff-bug lennart_array
# compiles but doesn't run
NOT_THESE += dmgob_native1 dmgob_native2
-# Native library doens't exist
+# Native library doesn't exist
ifneq "$(HWL_NOFIB_HACK)" ""
NOT_THESE += callback zhang_ccall
diff --git a/testsuite/tests/programs/andy_cherry/Interp.hs b/testsuite/tests/programs/andy_cherry/Interp.hs
index e323dc34f7..9b5f391409 100644
--- a/testsuite/tests/programs/andy_cherry/Interp.hs
+++ b/testsuite/tests/programs/andy_cherry/Interp.hs
@@ -93,7 +93,7 @@
| head tag == '(' && take 2 (reverse tag) == ":)" && length rest > 1 =
getCurrColour `thenP` \ col ->
let
- invert Black r = r -- because the move has *already* happend
+ invert Black r = r -- because the move has *already* happened
invert _ "0.00" = "0.00" -- don't negate 0
invert _ ('-':r) = r
invert _ r = '-':r
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags22.hs b/testsuite/tests/safeHaskell/flags/SafeFlags22.hs
index 0b94cff91c..3d5d8dc1af 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags22.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags22.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fwarn-unsafe #-}
-- | Basic test to see if Safe warning flags compile
--- Warn if module is infered unsafe
+-- Warn if module is inferred unsafe
-- In this test the warning _should_ fire
module SafeFlags22 where
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags23.hs b/testsuite/tests/safeHaskell/flags/SafeFlags23.hs
index 87f7b2dc5d..b3180bc1e1 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags23.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags23.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fwarn-unsafe -Werror #-}
-- | Basic test to see if Safe warning flags compile
--- Warn if module is infered unsafe
+-- Warn if module is inferred unsafe
-- In this test the warning _should_ fire and cause a compile fail
module SafeFlags22 where
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags24.hs b/testsuite/tests/safeHaskell/flags/SafeFlags24.hs
index 928d322e3c..ab63880f80 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags24.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags24.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fwarn-safe #-}
-- | Basic test to see if Safe warning flags compile
--- Warn if module is infered safe
+-- Warn if module is inferred safe
-- In this test the warning _shouldn't_ fire
module SafeFlags23 where
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags25.hs b/testsuite/tests/safeHaskell/flags/SafeFlags25.hs
index c97fa885d1..7d650d6a72 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags25.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags25.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fwarn-safe #-}
-- | Basic test to see if Safe warning flags compile
--- Warn if module is infered safe
+-- Warn if module is inferred safe
-- In this test the warning _should_ fire
module SafeFlags25 where
diff --git a/testsuite/tests/safeHaskell/flags/SafeFlags26.hs b/testsuite/tests/safeHaskell/flags/SafeFlags26.hs
index 0767448bca..45b65f3d9e 100644
--- a/testsuite/tests/safeHaskell/flags/SafeFlags26.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags26.hs
@@ -1,6 +1,6 @@
{-# OPTIONS_GHC -fwarn-safe -Werror #-}
-- | Basic test to see if Safe warning flags compile
--- Warn if module is infered safe
+-- Warn if module is inferred safe
-- In this test the warning _should_ fire and cause a compile fail
module SafeFlags26 where
diff --git a/testsuite/tests/safeHaskell/safeInfered/all.T b/testsuite/tests/safeHaskell/safeInfered/all.T
index be38d8ff12..e9b03b5458 100644
--- a/testsuite/tests/safeHaskell/safeInfered/all.T
+++ b/testsuite/tests/safeHaskell/safeInfered/all.T
@@ -7,14 +7,14 @@ def f( name, opts ):
setTestOpts(f)
-# Tests that should compile fine as they should be infered safe
+# Tests that should compile fine as they should be inferred safe
test('SafeInfered01', [], multimod_compile, ['SafeInfered01', ''])
test('SafeInfered02', [], multimod_compile, ['SafeInfered02', ''])
test('SafeInfered03', [], multimod_compile, ['SafeInfered03', ''])
test('SafeInfered04', [], multimod_compile, ['SafeInfered04', ''])
test('SafeInfered05', [], multimod_compile, ['SafeInfered05', ''])
-# Tests that should fail to compile as they should be infered unsafe
+# Tests that should fail to compile as they should be inferred unsafe
test('UnsafeInfered01', [], multimod_compile_fail, ['UnsafeInfered01', ''])
test('UnsafeInfered02', [], multimod_compile_fail, ['UnsafeInfered02', ''])
test('UnsafeInfered03', [], multimod_compile_fail, ['UnsafeInfered03', ''])
diff --git a/testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs
index 83b147e413..7c92fa9ab0 100644
--- a/testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs
@@ -441,7 +441,7 @@ mkPrimCon dt str cr = Constr
{ datatype = dt
, conrep = cr
, constring = str
- , confields = error $ concat ["constrFields : ", (tycon dt), " is primative"]
+ , confields = error $ concat ["constrFields : ", (tycon dt), " is primitive"]
, confixity = error "constrFixity"
}