From: Brian Warner <warner@allmydata.com>
Date: Fri, 21 Sep 2007 02:03:16 +0000 (-0700)
Subject: Makefile: check-speed: leave the client node stopped when we're done
X-Git-Tag: allmydata-tahoe-0.6.0~34
X-Git-Url: https://git.rkrishnan.org/listings/pb3user.py?a=commitdiff_plain;h=1fe65753853184a5f74019535d6adc3e3859d145;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: check-speed: leave the client node stopped when we're done
---

diff --git a/Makefile b/Makefile
index 17cc4ef2..7282d599 100644
--- a/Makefile
+++ b/Makefile
@@ -207,13 +207,19 @@ check-memory-once: .built
 # performance tests against a test network that is also pre-established
 # (probably on a remote machine). Provide it with the path to a local
 # directory where this client node has been created (and populated with the
-# necessary FURLs of the test network). This target will restart that client
-# with the current code and then run the tests.
+# necessary FURLs of the test network). This target will start that client
+# with the current code and then run the tests. Afterwards it will stop the
+# client.
+#
+# The 'sleep 5' is in there to give the new client a chance to connect to its
+# storageservers, since check_speed.py has no good way of doing that itself.
+
 check-speed: .built
 	if [ -z '$(TESTCLIENTDIR)' ]; then exit 1; fi
-	$(PYTHON) bin/allmydata-tahoe restart -f $(TESTCLIENTDIR)
-	sleep 1
+	$(PYTHON) bin/allmydata-tahoe start $(TESTCLIENTDIR)
+	sleep 5
 	$(PYTHON) src/allmydata/test/check_speed.py $(TESTCLIENTDIR)
+	$(PYTHON) bin/allmydata-tahoe stop $(TESTCLIENTDIR)
 
 test-darcs-boringfile:
 	$(MAKE)