summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorGergo ERDI <gergo@erdi.hu>2021-11-16 11:41:56 +0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-12-09 22:14:24 -0500
commitb6f7d145872573baa632a3bbee1c52f0596ec482 (patch)
treea2fdc62630c48e68868db48d8c7c9f02b1f7ac7c /testsuite
parent6d0319220ebc63a29b941483a6c40ed4f972dc24 (diff)
downloadhaskell-b6f7d145872573baa632a3bbee1c52f0596ec482.tar.gz
Remove `optLevel` from `DynFlags` (closes #20500)
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/ghc-api/T10052/T10052.stderr2
-rw-r--r--testsuite/tests/ghci.debugger/scripts/print007.stderr2
-rw-r--r--testsuite/tests/ghci/should_fail/T10549.stderr4
-rw-r--r--testsuite/tests/ghci/should_fail/T10549a.stderr2
-rw-r--r--testsuite/tests/regalloc/regalloc_unit_tests.hs2
-rw-r--r--testsuite/tests/safeHaskell/ghci/p14.stderr3
-rw-r--r--testsuite/tests/th/T8333.stderr3
7 files changed, 12 insertions, 6 deletions
diff --git a/testsuite/tests/ghc-api/T10052/T10052.stderr b/testsuite/tests/ghc-api/T10052/T10052.stderr
index 62f0b6d152..50db4fe9f2 100644
--- a/testsuite/tests/ghc-api/T10052/T10052.stderr
+++ b/testsuite/tests/ghc-api/T10052/T10052.stderr
@@ -1,3 +1,3 @@
when making flags consistent: warning:
- -O conflicts with --interactive; -O ignored.
+ Optimization flags conflict with --interactive; optimization flags ignored.
diff --git a/testsuite/tests/ghci.debugger/scripts/print007.stderr b/testsuite/tests/ghci.debugger/scripts/print007.stderr
index 62f0b6d152..50db4fe9f2 100644
--- a/testsuite/tests/ghci.debugger/scripts/print007.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print007.stderr
@@ -1,3 +1,3 @@
when making flags consistent: warning:
- -O conflicts with --interactive; -O ignored.
+ Optimization flags conflict with --interactive; optimization flags ignored.
diff --git a/testsuite/tests/ghci/should_fail/T10549.stderr b/testsuite/tests/ghci/should_fail/T10549.stderr
index 1f49f8e6c9..50db4fe9f2 100644
--- a/testsuite/tests/ghci/should_fail/T10549.stderr
+++ b/testsuite/tests/ghci/should_fail/T10549.stderr
@@ -1,3 +1,3 @@
-when making flags consistent: Warning:
- -O conflicts with --interactive; -O ignored.
+when making flags consistent: warning:
+ Optimization flags conflict with --interactive; optimization flags ignored.
diff --git a/testsuite/tests/ghci/should_fail/T10549a.stderr b/testsuite/tests/ghci/should_fail/T10549a.stderr
index 62f0b6d152..50db4fe9f2 100644
--- a/testsuite/tests/ghci/should_fail/T10549a.stderr
+++ b/testsuite/tests/ghci/should_fail/T10549a.stderr
@@ -1,3 +1,3 @@
when making flags consistent: warning:
- -O conflicts with --interactive; -O ignored.
+ Optimization flags conflict with --interactive; optimization flags ignored.
diff --git a/testsuite/tests/regalloc/regalloc_unit_tests.hs b/testsuite/tests/regalloc/regalloc_unit_tests.hs
index 7726c79b1f..b005982d2d 100644
--- a/testsuite/tests/regalloc/regalloc_unit_tests.hs
+++ b/testsuite/tests/regalloc/regalloc_unit_tests.hs
@@ -212,7 +212,7 @@ testGraphNoSpills logger dflags' path us = do
let acc n = maybe n (++ n) in
foldr (\(as, bs) (xs, ys) -> (acc xs as, acc ys bs)) ([], [])
- dflags = dflags' { optLevel = 2 }
+ dflags = updOptLevel 2 dflags'
-- discard irrelevant stats
extractSRMs x = case x of
diff --git a/testsuite/tests/safeHaskell/ghci/p14.stderr b/testsuite/tests/safeHaskell/ghci/p14.stderr
index 3e0ac0ae46..66ac9c0074 100644
--- a/testsuite/tests/safeHaskell/ghci/p14.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p14.stderr
@@ -1,4 +1,7 @@
+when making flags consistent: warning:
+ Optimization flags conflict with --interactive; optimization flags ignored.
+
<interactive>:10:25: error:
• No instance for (Num a) arising from a use of ‘f’
Possible fix: add (Num a) to the context of the RULE "id/Int"
diff --git a/testsuite/tests/th/T8333.stderr b/testsuite/tests/th/T8333.stderr
new file mode 100644
index 0000000000..50db4fe9f2
--- /dev/null
+++ b/testsuite/tests/th/T8333.stderr
@@ -0,0 +1,3 @@
+
+when making flags consistent: warning:
+ Optimization flags conflict with --interactive; optimization flags ignored.