summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2017-04-02 19:15:45 -0400
committerBen Gamari <ben@smart-cactus.org>2017-04-02 21:13:09 -0400
commit23011765244fe5a3c4583033e019a537278a45a9 (patch)
treeabe95f164b3ac5151ba22aeafc35a6f957214fb3
parent60307cb85abc8d53845598a430c0ee9264fb2d82 (diff)
downloadhaskell-23011765244fe5a3c4583033e019a537278a45a9.tar.gz
rts: Make out-of-memory errors more consistent
This will make it a bit easier to maintain consistent output in the testsuite.
-rw-r--r--rts/hooks/OutOfHeap.c2
-rw-r--r--rts/win32/OSMem.c2
-rw-r--r--testsuite/tests/rts/overflow1.stderr2
-rw-r--r--testsuite/tests/rts/overflow2.stderr2
-rw-r--r--testsuite/tests/rts/overflow3.stderr2
5 files changed, 5 insertions, 5 deletions
diff --git a/rts/hooks/OutOfHeap.c b/rts/hooks/OutOfHeap.c
index 3058cdd856..20d9809024 100644
--- a/rts/hooks/OutOfHeap.c
+++ b/rts/hooks/OutOfHeap.c
@@ -31,6 +31,6 @@ OutOfHeapHook (W_ request_size, W_ heap_size) /* both sizes in bytes */
}
} else {
- errorBelch("Out of memory.\n");
+ errorBelch("Out of memory\n");
}
}
diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c
index 2a542351ab..ad72ffba29 100644
--- a/rts/win32/OSMem.c
+++ b/rts/win32/OSMem.c
@@ -74,7 +74,7 @@ allocNew(uint32_t n) {
rec=0;
if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY) {
- errorBelch("Out of memory");
+ errorBelch("Out of memory\n");
stg_exit(EXIT_HEAPOVERFLOW);
} else {
sysErrorBelch(
diff --git a/testsuite/tests/rts/overflow1.stderr b/testsuite/tests/rts/overflow1.stderr
index 77ef3acd1b..05ec796a5f 100644
--- a/testsuite/tests/rts/overflow1.stderr
+++ b/testsuite/tests/rts/overflow1.stderr
@@ -1,2 +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 0e57a8e611..9f6cb3bff5 100644
--- a/testsuite/tests/rts/overflow2.stderr
+++ b/testsuite/tests/rts/overflow2.stderr
@@ -1,2 +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 aec22253ab..05261692d9 100644
--- a/testsuite/tests/rts/overflow3.stderr
+++ b/testsuite/tests/rts/overflow3.stderr
@@ -1,2 +1,2 @@
-overflow3: Out of memory.
+overflow3: Out of memory