Skip to content

Commit

Permalink
Revert "stop using bin/go and bin/env"
Browse files Browse the repository at this point in the history
This reverts commit 42bb42d.
  • Loading branch information
Alex Suraci and Jon Stevens committed Jun 13, 2013
1 parent 42bb42d commit 7862a20
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ install: go get -d -v ./src/github.com/...

script:
- gem install nats
- go version
- go env
- bin/go version
- bin/go env
- bin/test
7 changes: 7 additions & 0 deletions bin/env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

pushd $(dirname $0)/.. > /dev/null
base=$PWD
popd > /dev/null

exec env GOPATH=$base $@
3 changes: 3 additions & 0 deletions bin/go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

exec $(dirname $0)/env go $@
6 changes: 3 additions & 3 deletions bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ echo --- Installing
for p in $(packages)
do
echo $p
go test -i $p
bin/go test -i $p
done

echo --- Testing
Expand All @@ -21,9 +21,9 @@ do

if grep -q launchpad.net/gocheck src/$p/*.go
then
go test $p -test.v=true -gocheck.v=true $*
bin/go test $p -test.v=true -gocheck.v=true $*
else
go test $p -test.v=true $*
bin/go test $p -test.v=true $*
fi
fi
done

0 comments on commit 7862a20

Please sign in to comment.