From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 10 Jul 2015 04:23:01 +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/pf/content/simplejson/install.html?a=commitdiff_plain;h=9dc42f0ad9c22fd6c206bb6c21d6af0f24cd5f99;p=tahoe-lafs%2Ftahoe-lafs.git

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

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

diff --git a/Makefile b/Makefile
index 6df6bd6a..fa1cda7f 100644
--- a/Makefile
+++ b/Makefile
@@ -70,15 +70,18 @@ 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
+
 .PHONY: tmpfstest
 tmpfstest:
 	time make _tmpfstest 'TMPDIR=$(shell mktemp -d --tmpdir=.)'
 
 .PHONY: _tmpfstest
 _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)'