diff --git a/.travis.yml b/.travis.yml index 3c54847..5e84b81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: go go: - 1.x -script: -- go build -o haproxy-connect -ldflags "-X main.BuildTime=`date -u '+%Y-%m-%dT%H:%M:%SZ'` -X main.GitHash=`git rev-parse HEAD` -X main.Version=${TRAVIS_TAG:-Dev}" sudo: false before_deploy: - echo "Deploying $TRAVIS_TAG to GitHub releases" diff --git a/haproxy_test.go b/haproxy_test.go index 1c7d820..201b11f 100644 --- a/haproxy_test.go +++ b/haproxy_test.go @@ -7,12 +7,17 @@ import ( "net/http" + "github.com/haproxytech/haproxy-consul-connect/haproxy/haproxy_cmd" "github.com/haproxytech/haproxy-consul-connect/lib" "github.com/hashicorp/consul/api" "github.com/stretchr/testify/require" ) func TestSetup(t *testing.T) { + err := haproxy_cmd.CheckEnvironment(haproxy_cmd.DefaultDataplaneBin, haproxy_cmd.DefaultHAProxyBin) + if err != nil { + t.Skipf("CANNOT Run test because of missing requirement: %s", err.Error()) + } sd := lib.NewShutdown() client := startAgent(t, sd) defer func() {