Add benchmark into all.bash again.

all.bash

@@ -18,11 +18,8 @@ do
   (cd $d && go test go-fuse/$d )
 done
 
-# TODO - reinstate the benchmark
-exit 1
-
-gomake -C benchmark cstatfs
+make -C benchmark
 for d in benchmark
 do
-  (cd $d && gotest -test.bench '.*' -test.cpu 1,2 )
+  go test go-fuse/benchmark -test.bench '.*' -test.cpu 1,2
 done

benchmark/Makefile

-# Use "gomake install" to build and install this package.
-include $(GOROOT)/src/Make.inc
-
-TARG=github.com/hanwen/go-fuse/benchmark
-
-GOFILES=benchmark.go
-
-include $(GOROOT)/src/Make.pkg
-
 cstatfs: statfs.cc
 	g++ -O2 -Wall -std=c++0x $< `pkg-config fuse --cflags --libs` -o $@