diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2022-04-10 14:53:16 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-04-22 02:14:10 -0400 |
| commit | fcf22883774fab6e77058d981a3f840fa663e3ac (patch) | |
| tree | 0a3ed87d7aeb343e9461093740d14a141abf8c75 /testsuite | |
| parent | 8f9b8282a294150810db272815f1a47287bf33b6 (diff) | |
| download | haskell-fcf22883774fab6e77058d981a3f840fa663e3ac.tar.gz | |
Include the way string in the file name for dump files.
This can be disabled by `-fno-dump-with-ways` if not desired.
Finally we will be able to look at both profiled and non-profiled dumps
when compiling with dump flags and we compile in both ways.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/mk/test.mk | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci024.stdout | 1 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 | 1 | ||||
| -rw-r--r-- | testsuite/tests/ghci/should_run/T16012.script | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 18928316f8..dbe03286ce 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -37,7 +37,7 @@ endif # TEST_HC_OPTS is passed to every invocation of TEST_HC # in nested Makefiles -TEST_HC_OPTS = -dcore-lint -dstg-lint -dcmm-lint \ +TEST_HC_OPTS = -dcore-lint -dstg-lint -dcmm-lint -fno-dump-with-ways \ -no-user-package-db -rtsopts $(EXTRA_HC_OPTS) # Don't warn about missing specialisations. They can only occur with `-O`, but diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout b/testsuite/tests/ghci/scripts/ghci024.stdout index db6a7b955e..9b13afa9de 100644 --- a/testsuite/tests/ghci/scripts/ghci024.stdout +++ b/testsuite/tests/ghci/scripts/ghci024.stdout @@ -5,6 +5,7 @@ with the following modifiers: GHCi-specific dynamic flag settings: other dynamic, non-language, flag settings: -fno-diagnostics-show-caret + -fno-dump-with-ways -fexternal-dynamic-refs -fignore-optim-changes -fignore-hpc-changes diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 b/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 index a693b73aaf..bc008a3ddc 100644 --- a/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 +++ b/testsuite/tests/ghci/scripts/ghci024.stdout-mingw32 @@ -5,6 +5,7 @@ with the following modifiers: GHCi-specific dynamic flag settings: other dynamic, non-language, flag settings: -fno-diagnostics-show-caret + -fno-dump-with-ways -fignore-optim-changes -fignore-hpc-changes -fno-ghci-history diff --git a/testsuite/tests/ghci/should_run/T16012.script b/testsuite/tests/ghci/should_run/T16012.script index 2394e9c0ec..fd36138910 100644 --- a/testsuite/tests/ghci/should_run/T16012.script +++ b/testsuite/tests/ghci/should_run/T16012.script @@ -1,6 +1,8 @@ -- We expect the allocation counter to be initialized to zero and to count down. -- As ghc expressions are executed in their own thread a call to getAllocationCounter -- should always return a reasonably low result. +-- The actual number is somewhat arbitrary. If this fails because the value is slightly over +-- the threshold below it's fine to increase the threshold! n <- System.Mem.getAllocationCounter -if (n < 0 && n >= -200000) then putStrLn "Allocation counter in expected range" else (putStrLn $ "Unexpected allocation counter result:" ++ show n) +if (n < 0 && n >= -222222) then putStrLn "Allocation counter in expected range" else (putStrLn $ "Unexpected allocation counter result:" ++ show n) |