summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2018-03-26 00:16:31 +1100
committerdaurnimator <quae@daurnimator.com>2018-03-26 00:16:31 +1100
commitc7ef3aada90e6930bc29a1fc22d82f29f51bed91 (patch)
treee04fb29ff202ef30918ba25815fd50351a582cd6
parenta923f0700911ee20ae46c4b5c310d03ff8657b6d (diff)
downloadfengari-c7ef3aada90e6930bc29a1fc22d82f29f51bed91.tar.gz
fengari-c7ef3aada90e6930bc29a1fc22d82f29f51bed91.tar.bz2
fengari-c7ef3aada90e6930bc29a1fc22d82f29f51bed91.zip
src/luaconf.js: Set LUAI_MAXSTACK back to PUC-Rio default
FENGARICONF lets us override for travis
-rw-r--r--.travis.yml2
-rw-r--r--src/luaconf.js3
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index cb33e24..02a1448 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
script:
- yarn lint
- yarn build
- - travis_wait yarn test
+ - FENGARICONF='{"LUAI_MAXSTACK":100000}' travis_wait yarn test
notifications:
email: false
diff --git a/src/luaconf.js b/src/luaconf.js
index 424d4ea..3ca3a24 100644
--- a/src/luaconf.js
+++ b/src/luaconf.js
@@ -19,8 +19,7 @@ const LUA_MININTEGER = -2147483648;
** its only purpose is to stop Lua from consuming unlimited stack
** space (and to reserve some numbers for pseudo-indices).
*/
-/* TODO: put back to 1000000. Node would go out of memory in some cases (e.g. travis) */
-const LUAI_MAXSTACK = conf.LUAI_MAXSTACK || 100000;
+const LUAI_MAXSTACK = conf.LUAI_MAXSTACK || 1000000;
/*
@@ LUA_IDSIZE gives the maximum size for the description of the source