Merge pull request #99 from vbatts/cli.test

cli.test: fail on cli tests

Makefile

@@ -30,9 +30,7 @@ vet: .vet
 cli.test: .cli.test
 
 .cli.test: $(BUILD) $(wildcard ./test/cli/*.sh)
-	@ for test in ./test/cli/*.sh ; do \
+	@go run ./test/cli.go ./test/cli/*.sh && touch $@
-	bash $$test $(CWD) ; \
-	done && touch $@
 
 .PHONY: build
 build: $(BUILD)

test/cli.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"os/exec"
+)
+
+func main() {
+	flag.Parse()
+
+	failed := 0
+	for _, arg := range flag.Args() {
+		cmd := exec.Command("bash", arg)
+		cmd.Stderr = os.Stderr
+		cmd.Stdout = os.Stdout
+		if err := cmd.Run(); err != nil {
+			failed++
+		}
+	}
+	if failed > 0 {
+		fmt.Printf("%d FAILED tests\n", failed)
+		os.Exit(1)
+	}
+}

test/cli/0001.sh

@@ -2,7 +2,7 @@
 set -e
 
 name=$(basename $0)
-root=$1
+root="$(dirname $(dirname $(dirname $0)))"
 gomtree=$(readlink -f ${root}/gomtree)
 t=$(mktemp -d /tmp/go-mtree.XXXXXX)
 

test/cli/0002.sh

@@ -2,7 +2,7 @@
 set -e
 
 name=$(basename $0)
-root=$1
+root="$(dirname $(dirname $(dirname $0)))"
 gomtree=$(readlink -f ${root}/gomtree)
 t=$(mktemp -d /tmp/go-mtree.XXXXXX)
 

test/cli/0004.sh

@@ -3,7 +3,7 @@ set -e
 #set -x
 
 name=$(basename $0)
-root=$1
+root="$(dirname $(dirname $(dirname $0)))"
 gomtree=$(readlink -f ${root}/gomtree)
 t=$(mktemp -d /tmp/go-mtree.XXXXXX)
 

test/cli/0005.sh

@@ -2,7 +2,7 @@
 set -e
 
 name=$(basename $0)
-root=$1
+root="$(dirname $(dirname $(dirname $0)))"
 gomtree=$(readlink -f ${root}/gomtree)
 t=$(mktemp -d /tmp/go-mtree.XXXXXX)
 

test/cli/0006.sh

@@ -2,7 +2,7 @@
 set -e
 
 name=$(basename $0)
-root=$1
+root="$(dirname $(dirname $(dirname $0)))"
 gomtree=$(readlink -f ${root}/gomtree)
 t=$(mktemp -d /tmp/go-mtree.XXXXXX)