diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-11-07 20:29:43 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-11-07 20:29:43 -0800 |
commit | 7b633246186b42b11f6087f7c2f29262289e6883 (patch) | |
tree | b3f269cebc2d91cbbade194b50c846703bfb7b9d | |
parent | c6144aa6e2e466b0d2b14ce14809eb97c0c4929e (diff) |
improve memory growth error
-rw-r--r-- | src/preamble.js | 2 | ||||
-rwxr-xr-x | tests/runner.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/preamble.js b/src/preamble.js index fbc0f266..cf0a4c23 100644 --- a/src/preamble.js +++ b/src/preamble.js @@ -579,7 +579,7 @@ var STATICTOP; #if USE_TYPED_ARRAYS function enlargeMemory() { #if ALLOW_MEMORY_GROWTH == 0 - abort('Cannot enlarge memory arrays. Adjust TOTAL_MEMORY (currently ' + TOTAL_MEMORY + ') or compile with ALLOW_MEMORY_GROWTH'); + abort('Cannot enlarge memory arrays. Either (1) compile with -s TOTAL_MEMORY=X with X higher than the current value ( ' + TOTAL_MEMORY + '), (2) compile with ALLOW_MEMORY_GROWTH which adjusts the size at runtime but prevents some optimizations, or (3) set Module.TOTAL_MEMORY before the program runs.'); #else // TOTAL_MEMORY is the current size of the actual array, and STATICTOP is the new top. #if ASSERTIONS diff --git a/tests/runner.py b/tests/runner.py index e7b4e6ad..bdc1b317 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -2791,7 +2791,7 @@ def process(filename): ''' # Fail without memory growth - self.do_run(src, 'Cannot enlarge memory arrays. Adjust TOTAL_MEMORY (currently 10485760) or compile with ALLOW_MEMORY_GROWTH') + self.do_run(src, 'Cannot enlarge memory arrays.') fail = open('src.cpp.o.js').read() # Win with it |