diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index c86667cf6e5f9969d1676681e65afa88095916b3..1a212027b22915f7b9dafb86120fba6619628e0d 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1657,6 +1657,10 @@ mkExtraObjToLinkIntoBinary dflags = do
text " RtsConfig __conf = defaultRtsConfig;",
text " __conf.rts_opts_enabled = "
<> text (show (rtsOptsEnabled dflags)) <> semi,
+ text " __conf.rts_opts_suggestions = "
+ <> text (if rtsOptsSuggestions dflags
+ then "rtsTrue"
+ else "rtsFalse") <> semi,
case rtsOpts dflags of
Nothing -> Outputable.empty
Just opts -> ptext (sLit " __conf.rts_opts= ") <>
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index f078c5162af6f0904d59d1c5711d4553f4604ba7..d8f5169122a388b71515fe56fcc1c58a2b50dc72 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -746,6 +746,7 @@ data DynFlags = DynFlags {
rtsOpts :: Maybe String,
rtsOptsEnabled :: RtsOptsEnabled,
+ rtsOptsSuggestions :: Bool,
hpcDir :: String, -- ^ Path to store the .mix files
@@ -1473,6 +1474,7 @@ defaultDynFlags mySettings =
cmdlineFrameworks = [],
rtsOpts = Nothing,
rtsOptsEnabled = RtsOptsSafeOnly,
+ rtsOptsSuggestions = True,
hpcDir = ".hpc",
@@ -2392,6 +2394,8 @@ dynamic_flags = [
, defGhcFlag "rtsopts=some" (NoArg (setRtsOptsEnabled RtsOptsSafeOnly))
, defGhcFlag "rtsopts=none" (NoArg (setRtsOptsEnabled RtsOptsNone))
, defGhcFlag "no-rtsopts" (NoArg (setRtsOptsEnabled RtsOptsNone))
+ , defGhcFlag "no-rtsopts-suggestions"
+ (noArg (\d -> d {rtsOptsSuggestions = False} ))
, defGhcFlag "main-is" (SepArg setMainIs)
, defGhcFlag "haddock" (NoArg (setGeneralFlag Opt_Haddock))
, defGhcFlag "haddock-opts" (hasArg addHaddockOpts)
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index f62fe22067fc9356e485a5c285e1a2e286df90dc..de6c2c8ed8197dfc234b8e6592e03032079939a4 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -2606,6 +2606,14 @@
dynamic
-
+
+
+ Don't print RTS suggestions about linking with
+ -rtsopts.
+
+ dynamic
+ -
+
Omit linking
diff --git a/docs/users_guide/phases.xml b/docs/users_guide/phases.xml
index 8994ffe72e747ec5441236c7763f1b626f145f14..05037b7e8999dce40a217ef7a0c3251fa6110262 100644
--- a/docs/users_guide/phases.xml
+++ b/docs/users_guide/phases.xml
@@ -1219,6 +1219,27 @@ $ cat foo.hspp
+
+
+
+
+
+
+
+ This option disables RTS suggestions about linking with
+ when they are not available.
+
+ These suggestions would be unhelpful if the users have installed Haskell programs
+ through their package managers.
+ With this option enabled, these suggestions will not appear.
+
+ It is recommended for people distributing binaries
+ to build with either or
+ .
+
+
+
+
diff --git a/includes/RtsAPI.h b/includes/RtsAPI.h
index 853a3a5b30883c33943264864ba34a41ac044db9..3b6de0f10c964af531b4ba7bab7722001a7ed05f 100644
--- a/includes/RtsAPI.h
+++ b/includes/RtsAPI.h
@@ -64,6 +64,9 @@ typedef struct {
// Whether to interpret +RTS options on the command line
RtsOptsEnabledEnum rts_opts_enabled;
+ // Whether to give RTS flag suggestions
+ HsBool rts_opts_suggestions;
+
// additional RTS options
const char *rts_opts;
diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c
index ba1adcd5d0853e2eadb92ee38658ae1ca82c59e0..25112a7e1e3b5acfd7ed7aca208333499fc8ee85 100644
--- a/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
@@ -280,12 +280,14 @@ nextEra( void )
era++;
if (era == max_era) {
- if (rtsConfig.rts_opts_enabled == RtsOptsAll) {
- errorBelch("maximum number of censuses reached;\n"
- "use +RTS -i to reduce");
- } else {
- errorBelch("maximum number of censuses reached;\n"
- "Relink with -rtsopts and use `+RTS -i` to reduce");
+ errorBelch("Maximum number of censuses reached.");
+ if (rtsConfig.rts_opts_suggestions == rtsTrue) {
+ if (rtsConfig.rts_opts_enabled == RtsOptsAll) {
+ errorBelch("Use `+RTS -i' to reduce censuses.");
+ } else {
+ errorBelch("Relink with -rtsopts and "
+ "use `+RTS -i' to reduce censuses.");
+ }
}
stg_exit(EXIT_FAILURE);
}
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 0fbd05af2fac682dc6a724e1116a2ecfd0a0c03c..94a6c0edeb404daf18bfa47a674ffc0864a5e2b3 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -59,6 +59,7 @@ RtsConfig rtsConfig;
const RtsConfig defaultRtsConfig = {
.rts_opts_enabled = RtsOptsSafeOnly,
+ .rts_opts_suggestions = rtsTrue,
.rts_opts = NULL,
.rts_hs_main = rtsFalse,
.defaultsHook = FlagDefaultsHook,
diff --git a/rts/hooks/OutOfHeap.c b/rts/hooks/OutOfHeap.c
index bb8752846f0a245cfdec58c2fde80dda0148cd93..5e68750d716d00ac706232aa39268033c293ca4c 100644
--- a/rts/hooks/OutOfHeap.c
+++ b/rts/hooks/OutOfHeap.c
@@ -13,17 +13,24 @@
void
OutOfHeapHook (W_ request_size, W_ heap_size) /* both sizes in bytes */
{
- (void)request_size; /* keep gcc -Wall happy */
- if (heap_size > 0) {
- errorBelch("Heap exhausted;\n"
- "Current maximum heap size is %" FMT_Word
- " bytes (%" FMT_Word " MB);\n"
- "%s `+RTS -M' to increase it.",
- heap_size, heap_size / (1024*1024),
- ((rtsConfig.rts_opts_enabled == RtsOptsAll)
- ? "use"
- : "relink with -rtsopts and use"));
- } else {
- errorBelch("out of memory");
- }
+ (void)request_size; /* keep gcc -Wall happy */
+ if (heap_size > 0) {
+ errorBelch("Heap exhausted;");
+ errorBelch("Current maximum heap size is %" FMT_Word
+ " bytes (%" FMT_Word " MB).",
+ heap_size, heap_size / (1024*1024));
+
+ if (rtsConfig.rts_opts_suggestions == rtsTrue) {
+
+ if (rtsConfig.rts_opts_enabled == RtsOptsAll) {
+ errorBelch("Use `+RTS -M' to increase it.");
+ } else {
+ errorBelch("Relink with -rtsopts and "
+ "use `+RTS -M' to increase it.");
+ }
+
+ }
+ } else {
+ errorBelch("Out of memory.\n");
+ }
}
diff --git a/rts/hooks/StackOverflow.c b/rts/hooks/StackOverflow.c
index 1ae8603eec61ca2297a5d09e1fedefc5cd1f3015..602700ad7782af177de08f749263ef03c7561f95 100644
--- a/rts/hooks/StackOverflow.c
+++ b/rts/hooks/StackOverflow.c
@@ -14,12 +14,15 @@
void
StackOverflowHook (W_ stack_size) /* in bytes */
{
- fprintf(stderr,
- "Stack space overflow: current size %" FMT_Word " bytes.\n"
- "%s `+RTS -Ksize -RTS' to increase it.\n",
- stack_size,
- ((rtsConfig.rts_opts_enabled == RtsOptsAll)
- ? "Use"
- : "Relink with -rtsopts and use")
- );
+ errorBelch("Stack space overflow: current size %" FMT_Word " bytes.",
+ stack_size);
+
+ if (rtsConfig.rts_opts_suggestions == rtsTrue) {
+ if (rtsConfig.rts_opts_enabled == RtsOptsAll) {
+ errorBelch("Use `+RTS -Ksize -RTS' to increase it.");
+ } else {
+ errorBelch("Relink with -rtsopts and "
+ "use `+RTS -Ksize -RTS' to increase it.");
+ }
+ }
}
diff --git a/testsuite/tests/rts/T5644/T5644.stderr b/testsuite/tests/rts/T5644/T5644.stderr
index 198dceb2bb1c8e91b7f7ac4cdc6c64e0d3ae6782..e5b0ab950bccd16885e336a8775ed606eb2f08e9 100644
--- a/testsuite/tests/rts/T5644/T5644.stderr
+++ b/testsuite/tests/rts/T5644/T5644.stderr
@@ -1,3 +1,3 @@
T5644: Heap exhausted;
-Current maximum heap size is 20971520 bytes (20 MB);
-use `+RTS -M' to increase it.
+T5644: Current maximum heap size is 20971520 bytes (20 MB).
+T5644: Use `+RTS -M' to increase it.
diff --git a/testsuite/tests/rts/T9579/.gitignore b/testsuite/tests/rts/T9579/.gitignore
index e3a88e5db1e56e9b23a13283a9545a2e3fc4963c..3c118b031a94f7ecbc1f2d66af5e6c20a41cf1eb 100644
--- a/testsuite/tests/rts/T9579/.gitignore
+++ b/testsuite/tests/rts/T9579/.gitignore
@@ -1,6 +1,8 @@
+T9579_outofheap_rtsall_no_suggestions
T9579_outofheap_rtsall
T9579_outofheap_rtsnone
T9579_outofheap_rtssome
+T9579_stackoverflow_rtsall_no_suggestions
T9579_stackoverflow_rtsall
T9579_stackoverflow_rtsnone
T9579_stackoverflow_rtssome
diff --git a/testsuite/tests/rts/T9579/Makefile b/testsuite/tests/rts/T9579/Makefile
index a205eacb78a2b8c529f1d3b5fe645d77224c321a..b05f0c474f26f010f0a08538a3e76d6fc8be8806 100644
--- a/testsuite/tests/rts/T9579/Makefile
+++ b/testsuite/tests/rts/T9579/Makefile
@@ -4,30 +4,42 @@ include $(TOP)/mk/test.mk
T9579_stackoverflow_rtsnone:
'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=none -fforce-recomp -with-rtsopts -K1m \
- -outputdir tmp_T9579_stackoverflow_rtsnone \
- StackOverflow.hs -o T9579_stackoverflow_rtsnone
+ -outputdir tmp_T9579_stackoverflow_rtsnone \
+ StackOverflow.hs -o T9579_stackoverflow_rtsnone
T9579_stackoverflow_rtssome:
'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=some -fforce-recomp -with-rtsopts -K1m \
- -outputdir tmp_T9579_stackoverflow_rtssome \
- StackOverflow.hs -o T9579_stackoverflow_rtssome
+ -outputdir tmp_T9579_stackoverflow_rtssome \
+ StackOverflow.hs -o T9579_stackoverflow_rtssome
T9579_stackoverflow_rtsall:
'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=all -fforce-recomp -with-rtsopts -K1m \
- -outputdir tmp_T9579_stackoverflow_rtsall \
- StackOverflow.hs -o T9579_stackoverflow_rtsall
+ -outputdir tmp_T9579_stackoverflow_rtsall \
+ StackOverflow.hs -o T9579_stackoverflow_rtsall
+
+T9579_stackoverflow_rtsall_no_suggestions:
+ '$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=all -fforce-recomp -with-rtsopts -K1m \
+ -no-rtsopts-suggestions \
+ -outputdir tmp_T9579_stackoverflow_rtsall_no_suggestions \
+ StackOverflow.hs -o T9579_stackoverflow_rtsall_no_suggestions
T9579_outofheap_rtsnone:
'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=none -fforce-recomp -with-rtsopts -M1m \
- -outputdir tmp_T9579_outofheap_rtsnone \
- OutOfHeap.hs -o T9579_outofheap_rtsnone
+ -outputdir tmp_T9579_outofheap_rtsnone \
+ OutOfHeap.hs -o T9579_outofheap_rtsnone
T9579_outofheap_rtssome:
'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=some -fforce-recomp -with-rtsopts -M1m \
- -outputdir tmp_T9579_outofheap_rtssome \
- OutOfHeap.hs -o T9579_outofheap_rtssome
+ -outputdir tmp_T9579_outofheap_rtssome \
+ OutOfHeap.hs -o T9579_outofheap_rtssome
T9579_outofheap_rtsall:
'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=all -fforce-recomp -with-rtsopts -M1m \
- -outputdir tmp_T9579_outofheap_rtsall \
- OutOfHeap.hs -o T9579_outofheap_rtsall
+ -outputdir tmp_T9579_outofheap_rtsall \
+ OutOfHeap.hs -o T9579_outofheap_rtsall
+
+T9579_outofheap_rtsall_no_suggestions:
+ '$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts=all -fforce-recomp -with-rtsopts -M1m \
+ -no-rtsopts-suggestions \
+ -outputdir tmp_T9579_outofheap_rtsall_no_suggestions \
+ OutOfHeap.hs -o T9579_outofheap_rtsall_no_suggestions
diff --git a/testsuite/tests/rts/T9579/T9579_outofheap_rtsall.stderr b/testsuite/tests/rts/T9579/T9579_outofheap_rtsall.stderr
index 4fb0b8671597b4ec69a199e985893adf787e5dac..3d7cfe7565816a917f26f51751b9c305c07f05cb 100644
--- a/testsuite/tests/rts/T9579/T9579_outofheap_rtsall.stderr
+++ b/testsuite/tests/rts/T9579/T9579_outofheap_rtsall.stderr
@@ -1,3 +1,3 @@
T9579_outofheap_rtsall: Heap exhausted;
-Current maximum heap size is 1048576 bytes (1 MB);
-use `+RTS -M' to increase it.
+T9579_outofheap_rtsall: Current maximum heap size is 1048576 bytes (1 MB).
+T9579_outofheap_rtsall: Use `+RTS -M' to increase it.
diff --git a/testsuite/tests/rts/T9579/T9579_outofheap_rtsall_no_suggestions.stderr b/testsuite/tests/rts/T9579/T9579_outofheap_rtsall_no_suggestions.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..c5d1ce38783a8f38021fa8eaa3f2e4b5ee9279c7
--- /dev/null
+++ b/testsuite/tests/rts/T9579/T9579_outofheap_rtsall_no_suggestions.stderr
@@ -0,0 +1,2 @@
+T9579_outofheap_rtsall_no_suggestions: Heap exhausted;
+T9579_outofheap_rtsall_no_suggestions: Current maximum heap size is 1048576 bytes (1 MB).
diff --git a/testsuite/tests/rts/T9579/T9579_outofheap_rtsnone.stderr b/testsuite/tests/rts/T9579/T9579_outofheap_rtsnone.stderr
index ce7e05f0bcdb888849dcd3be89cdfbde4e7c5075..3bc209688e52f4fbbfff609b6cf3bd2b8d565ecd 100644
--- a/testsuite/tests/rts/T9579/T9579_outofheap_rtsnone.stderr
+++ b/testsuite/tests/rts/T9579/T9579_outofheap_rtsnone.stderr
@@ -1,3 +1,3 @@
T9579_outofheap_rtsnone: Heap exhausted;
-Current maximum heap size is 1048576 bytes (1 MB);
-relink with -rtsopts and use `+RTS -M' to increase it.
+T9579_outofheap_rtsnone: Current maximum heap size is 1048576 bytes (1 MB).
+T9579_outofheap_rtsnone: Relink with -rtsopts and use `+RTS -M' to increase it.
diff --git a/testsuite/tests/rts/T9579/T9579_outofheap_rtssome.stderr b/testsuite/tests/rts/T9579/T9579_outofheap_rtssome.stderr
index 25b88e4dd9c96ebb26ce800eb72cfe9e9abc93a4..a6f03776db4fdc1fdc6c8de9f3fa1ed0d4347f51 100644
--- a/testsuite/tests/rts/T9579/T9579_outofheap_rtssome.stderr
+++ b/testsuite/tests/rts/T9579/T9579_outofheap_rtssome.stderr
@@ -1,3 +1,3 @@
T9579_outofheap_rtssome: Heap exhausted;
-Current maximum heap size is 1048576 bytes (1 MB);
-relink with -rtsopts and use `+RTS -M' to increase it.
+T9579_outofheap_rtssome: Current maximum heap size is 1048576 bytes (1 MB).
+T9579_outofheap_rtssome: Relink with -rtsopts and use `+RTS -M' to increase it.
diff --git a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall.stderr b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall.stderr
index fd7fe193579b136d40b1cddd5ff18ccc72735c30..16404b8b878878be61010c7b53de00b1dd010f79 100644
--- a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall.stderr
+++ b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall.stderr
@@ -1,2 +1,2 @@
-Stack space overflow: current size 99136 bytes.
-Use `+RTS -Ksize -RTS' to increase it.
+T9579_stackoverflow_rtsall: Stack space overflow: current size 99136 bytes.
+T9579_stackoverflow_rtsall: Use `+RTS -Ksize -RTS' to increase it.
diff --git a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall_no_suggestions.stderr b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall_no_suggestions.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..29a04b5159945246fc1daabc513c20fa98015aef
--- /dev/null
+++ b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsall_no_suggestions.stderr
@@ -0,0 +1 @@
+T9579_stackoverflow_rtsall_no_suggestions: Stack space overflow: current size 99136 bytes.
diff --git a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsnone.stderr b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsnone.stderr
index 0287e365c50f5c89233c3175975f5efaaf715722..9151addaf29ce32b62e3d80b2eb111e3c59842d5 100644
--- a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsnone.stderr
+++ b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtsnone.stderr
@@ -1,2 +1,2 @@
-Stack space overflow: current size 99136 bytes.
-Relink with -rtsopts and use `+RTS -Ksize -RTS' to increase it.
+T9579_stackoverflow_rtsnone: Stack space overflow: current size 99136 bytes.
+T9579_stackoverflow_rtsnone: Relink with -rtsopts and use `+RTS -Ksize -RTS' to increase it.
diff --git a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtssome.stderr b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtssome.stderr
index 0287e365c50f5c89233c3175975f5efaaf715722..3bbfefe1b7a6e5fc613e225f8fd1ce9aaf4659bd 100644
--- a/testsuite/tests/rts/T9579/T9579_stackoverflow_rtssome.stderr
+++ b/testsuite/tests/rts/T9579/T9579_stackoverflow_rtssome.stderr
@@ -1,2 +1,2 @@
-Stack space overflow: current size 99136 bytes.
-Relink with -rtsopts and use `+RTS -Ksize -RTS' to increase it.
+T9579_stackoverflow_rtssome: Stack space overflow: current size 99136 bytes.
+T9579_stackoverflow_rtssome: Relink with -rtsopts and use `+RTS -Ksize -RTS' to increase it.
diff --git a/testsuite/tests/rts/T9579/all.T b/testsuite/tests/rts/T9579/all.T
index 8b6880c8e3a525af04dee53f31be926eb22b2424..e029b4acb06003b1be97d30cf6d13210c8361b66 100644
--- a/testsuite/tests/rts/T9579/all.T
+++ b/testsuite/tests/rts/T9579/all.T
@@ -1,29 +1,64 @@
test('T9579_stackoverflow_rtsnone',
- [exit_code(2)],
+ [exit_code(2),
+ extra_clean([ 'tmp_T9579_stackoverflow_rtsnone/Main.hi',
+ 'tmp_T9579_stackoverflow_rtsnone/Main.o' ])],
run_command,
- ['$MAKE -s --no-print-directory T9579_stackoverflow_rtsnone && ./T9579_stackoverflow_rtsnone'])
+ ['$MAKE -s --no-print-directory T9579_stackoverflow_rtsnone \
+ && ./T9579_stackoverflow_rtsnone'])
test('T9579_stackoverflow_rtssome',
- [exit_code(2)],
+ [exit_code(2),
+ extra_clean([ 'tmp_T9579_stackoverflow_rtssome/Main.hi',
+ 'tmp_T9579_stackoverflow_rtssome/Main.o' ])],
run_command,
- ['$MAKE -s --no-print-directory T9579_stackoverflow_rtssome && ./T9579_stackoverflow_rtssome'])
+ ['$MAKE -s --no-print-directory T9579_stackoverflow_rtssome \
+ && ./T9579_stackoverflow_rtssome'])
test('T9579_stackoverflow_rtsall',
- [exit_code(2)],
+ [exit_code(2),
+ extra_clean([ 'tmp_T9579_stackoverflow_rtsall/Main.hi',
+ 'tmp_T9579_stackoverflow_rtsall/Main.o' ])],
run_command,
- ['$MAKE -s --no-print-directory T9579_stackoverflow_rtsall && ./T9579_stackoverflow_rtsall'])
+ ['$MAKE -s --no-print-directory T9579_stackoverflow_rtsall \
+ && ./T9579_stackoverflow_rtsall'])
+
+test('T9579_stackoverflow_rtsall_no_suggestions',
+ [exit_code(2),
+ extra_clean([ 'tmp_T9579_stackoverflow_rtsall_no_suggestions/Main.hi',
+ 'tmp_T9579_stackoverflow_rtsall_no_suggestions/Main.o' ])],
+ run_command,
+ ['$MAKE -s --no-print-directory T9579_stackoverflow_rtsall_no_suggestions \
+ && ./T9579_stackoverflow_rtsall_no_suggestions'])
test('T9579_outofheap_rtsnone',
- [exit_code(251)],
+ [exit_code(251),
+ extra_clean([ 'tmp_T9579_outofheap_rtsnone/Main.hi',
+ 'tmp_T9579_outofheap_rtsnone/Main.o' ])],
run_command,
- ['$MAKE -s --no-print-directory T9579_outofheap_rtsnone && ./T9579_outofheap_rtsnone'])
+ ['$MAKE -s --no-print-directory T9579_outofheap_rtsnone \
+ && ./T9579_outofheap_rtsnone'])
test('T9579_outofheap_rtssome',
- [exit_code(251)],
+ [exit_code(251),
+ extra_clean([ 'tmp_T9579_outofheap_rtssome/Main.hi',
+ 'tmp_T9579_outofheap_rtssome/Main.o' ])],
run_command,
- ['$MAKE -s --no-print-directory T9579_outofheap_rtssome && ./T9579_outofheap_rtssome'])
+ ['$MAKE -s --no-print-directory T9579_outofheap_rtssome \
+ && ./T9579_outofheap_rtssome'])
test('T9579_outofheap_rtsall',
- [exit_code(251)],
+ [exit_code(251),
+ extra_clean([ 'tmp_T9579_outofheap_rtsall/Main.hi',
+ 'tmp_T9579_outofheap_rtsall/Main.o' ])],
+
+ run_command,
+ ['$MAKE -s --no-print-directory T9579_outofheap_rtsall \
+ && ./T9579_outofheap_rtsall'])
+
+test('T9579_outofheap_rtsall_no_suggestions',
+ [exit_code(251),
+ extra_clean([ 'tmp_T9579_outofheap_rtsall_no_suggestions/Main.hi',
+ 'tmp_T9579_outofheap_rtsall_no_suggestions/Main.o' ])],
run_command,
- ['$MAKE -s --no-print-directory T9579_outofheap_rtsall && ./T9579_outofheap_rtsall'])
+ ['$MAKE -s --no-print-directory T9579_outofheap_rtsall_no_suggestions \
+ && ./T9579_outofheap_rtsall_no_suggestions'])
diff --git a/testsuite/tests/rts/outofmem.stderr b/testsuite/tests/rts/outofmem.stderr
index 81856a75448bd56d31ec636e07c847c9b4552ad5..4b16ce95984b14ec7df2b353142bcab59a08647f 100644
--- a/testsuite/tests/rts/outofmem.stderr
+++ b/testsuite/tests/rts/outofmem.stderr
@@ -1 +1 @@
-outofmem.exe: out of memory
+outofmem.exe: Out of memory
diff --git a/testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32 b/testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32
index 81856a75448bd56d31ec636e07c847c9b4552ad5..4b16ce95984b14ec7df2b353142bcab59a08647f 100644
--- a/testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32
+++ b/testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32
@@ -1 +1 @@
-outofmem.exe: out of memory
+outofmem.exe: Out of memory
diff --git a/testsuite/tests/rts/outofmem2.stderr b/testsuite/tests/rts/outofmem2.stderr
index 8fb459b668984ea9ee15c5dac051d9c7f5538aab..e4548d008030132d010951cd59d469657228d1f5 100644
--- a/testsuite/tests/rts/outofmem2.stderr
+++ b/testsuite/tests/rts/outofmem2.stderr
@@ -1,3 +1,3 @@
outofmem2: Heap exhausted;
-Current maximum heap size is 5242880 bytes (5 MB);
-use `+RTS -M' to increase it.
+outofmem2: Current maximum heap size is 5242880 bytes (5 MB).
+outofmem2: Use `+RTS -M' to increase it.
diff --git a/testsuite/tests/rts/overflow1.stderr b/testsuite/tests/rts/overflow1.stderr
index 734ca954cad581c04ea2d0357139c25edab5362e..77ef3acd1b05f4518a6e473e94613a18cf6ec821 100644
--- a/testsuite/tests/rts/overflow1.stderr
+++ b/testsuite/tests/rts/overflow1.stderr
@@ -1 +1,2 @@
-overflow1: out of memory
+overflow1: Out of memory.
+
diff --git a/testsuite/tests/rts/overflow2.stderr b/testsuite/tests/rts/overflow2.stderr
index be65509ea92805957c6bda47d7e60deee8168418..0e57a8e61177d91d6113b24bae9223ab6401059e 100644
--- a/testsuite/tests/rts/overflow2.stderr
+++ b/testsuite/tests/rts/overflow2.stderr
@@ -1 +1,2 @@
-overflow2: out of memory
+overflow2: Out of memory.
+
diff --git a/testsuite/tests/rts/overflow3.stderr b/testsuite/tests/rts/overflow3.stderr
index 6c804e5048965ce02ab197ab77ddd2c17a979a3e..aec22253ab57ab71be9739731f1289f0057b4b8b 100644
--- a/testsuite/tests/rts/overflow3.stderr
+++ b/testsuite/tests/rts/overflow3.stderr
@@ -1 +1,2 @@
-overflow3: out of memory
+overflow3: Out of memory.
+
diff --git a/testsuite/tests/simplCore/should_run/simplrun010.stderr b/testsuite/tests/simplCore/should_run/simplrun010.stderr
index a2a586d00a1509c2c2710ef9dbeff1d61087634c..4d524d3ba47b42ded6de59012946f1a656f3b4d0 100644
--- a/testsuite/tests/simplCore/should_run/simplrun010.stderr
+++ b/testsuite/tests/simplCore/should_run/simplrun010.stderr
@@ -1,3 +1,3 @@
simplrun010: Heap exhausted;
-Current maximum heap size is 10485760 bytes (10 MB);
-use `+RTS -M' to increase it.
+simplrun010: Current maximum heap size is 10485760 bytes (10 MB).
+simplrun010: Use `+RTS -M' to increase it.