moved sharness tests to a subdir.

kept bin in place

Makefile

@@ -35,10 +35,10 @@ test_go_expensive:
 	go test ./...
 
 test_sharness_short:
-	cd test/ && make
+	cd test/sharness/ && make
 
 test_sharness_expensive:
-	cd test/ && TEST_EXPENSIVE=1 make
+	cd test/sharness/ && TEST_EXPENSIVE=1 make
 
 test_all_commits:
 	@echo "testing all commits between origin/master..HEAD"

test/.gitignore

@@ -1,5 +1,2 @@
-lib/sharness/
 bin/ipfs
 bin/random
-test-results/
-trash directory.*.sh/

test/Makefile

@@ -1,45 +1,25 @@
-# Run tests
-#
-# Copyright (c) 2014 Christian Couder
-# MIT Licensed; see the LICENSE file in this repository.
-#
 
-# NOTE: run with TEST_VERBOSE=1 for verbose sharness tests.
+BINS = bin/random bin/ipfs
+IPFS_ROOT = ../
+IPFS_CMD = ../cmd/ipfs
+RANDOM_SRC = ../Godeps/_workspace/src/github.com/jbenet/go-random
 
-T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
+all: deps
-SHARNESS = lib/sharness/sharness.sh
-RANDOMSRC = Godeps/_workspace/src/github.com/jbenet/go-random/random
 
-all: clean deps $(T) aggregate
+deps: bins
 
 clean:
-	@echo "*** $@ ***"
+	rm $(BINS)
-	-rm -rf test-results
 
-$(T):
+bins: $(BINS)
-	@echo "*** $@ ***"
-	./$@
 
-aggregate:
+bin/random: $(RANDOM_SRC)/**/*.go
-	@echo "*** $@ ***"
+	go build -o bin/random $(RANDOM_SRC)/random
-	lib/test-aggregate-results.sh
 
-deps: $(SHARNESS) ipfs random
+bin/ipfs: $(IPFS_ROOT)/**/*.go
+	go build -o bin/ipfs $(IPFS_CMD)
 
-$(SHARNESS):
+test_sharness:
-	@echo "*** installing $@ ***"
+	cd sharness && make
-	lib/install-sharness.sh
 
-# phony to ensure we re-build it every time we run tests
+.PHONY: all clean
-ipfs:
-	@echo "*** installing $@ ***"
-	mkdir -p bin
-	cd ../cmd/ipfs && go build
-	cp ../cmd/ipfs/ipfs bin/ipfs
-
-random:
-	@echo "*** installing $@ ***"
-	mkdir -p bin
-	go build -o bin/random ../$(RANDOMSRC)
-
-.PHONY: all clean $(T) aggregate ipfs random

test/sharness/.gitignore

@@ -0,0 +1,3 @@
+lib/sharness/
+test-results/
+trash directory.*.sh/

test/sharness/Makefile

@@ -0,0 +1,37 @@
+# Run tests
+#
+# Copyright (c) 2014 Christian Couder
+# MIT Licensed; see the LICENSE file in this repository.
+#
+
+# NOTE: run with TEST_VERBOSE=1 for verbose sharness tests.
+
+T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
+BINS = bin/random bin/ipfs
+SHARNESS = lib/sharness/sharness.sh
+
+all: clean deps $(T) aggregate
+
+clean:
+	@echo "*** $@ ***"
+	-rm -rf test-results
+
+$(T):
+	@echo "*** $@ ***"
+	./$@
+
+aggregate:
+	@echo "*** $@ ***"
+	lib/test-aggregate-results.sh
+
+deps: $(SHARNESS) $(BINS)
+
+$(SHARNESS):
+	@echo "*** installing $@ ***"
+	lib/install-sharness.sh
+
+bin/%:
+	@echo "*** installing $@ ***"
+	cd .. && make $@
+
+.PHONY: all clean $(T) aggregate

test/sharness/bin

@@ -0,0 +1 @@
+../bin