From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 8 Apr 2014 23:59:24 +0000 (+0100)
Subject: Makefile: allow tmpfs size to be more easily overridden, and use 500 MiB by default... 
X-Git-Url: https://git.rkrishnan.org/simplejson/components/configuration.txt?a=commitdiff_plain;h=d6d759f590779e7b173d92e25c1dd988c8fe4f04;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: allow tmpfs size to be more easily overridden, and use 500 MiB by default (rebased).

(The kernel will only allocate space that is used; the limit is just in case
tests write more than expected.)

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/Makefile b/Makefile
index a0e05583..be3cd21b 100644
--- a/Makefile
+++ b/Makefile
@@ -62,13 +62,16 @@ quicktest: make-version
 	$(TAHOE) debug trial $(TRIALARGS) $(TEST)
 
 # "make tmpfstest" may be a faster way of running tests on Linux. It works best when you have
-# at least 330 MiB of free physical memory (to run the whole test suite). Since it uses sudo
-# to mount/unmount the tmpfs filesystem, it might prompt for your password.
+# at least $(TMPFS_SIZE) of free physical memory (to run the whole test suite). Since it uses
+# sudo to mount/unmount the tmpfs filesystem, it might prompt for your password.
+
+TMPFS_SIZE = 500m
+
 tmpfstest:
 	time make _tmpfstest 'TMPDIR=$(shell mktemp -d --tmpdir=.)'
 
 _tmpfstest: make-version
-	sudo mount -t tmpfs -o size=400m tmpfs '$(TMPDIR)'
+	sudo mount -t tmpfs -o size=$(TMPFS_SIZE) tmpfs '$(TMPDIR)'
 	-$(TAHOE) debug trial --rterrors '--temp-directory=$(TMPDIR)/_trial_temp' $(TRIALARGS) $(TEST)
 	sudo umount '$(TMPDIR)'
 	rmdir '$(TMPDIR)'