Merge pull request #1141 from hashicorp/f-travis

Try moving to newer Travis-CI infrastructure
hashicorp · Jul 28, 2015 · 93c9c87 · 93c9c87
2 parents 6cc2d21 + 40f3e3f
commit 93c9c87
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,14 @@
 language: go
 
 go:
-    - tip
+  - tip
 
 branches:
   only:
     - master
 
 install: make deps
 script:
-    - make test
+  - make test
+
+sudo: false
diff --git a/command/agent/syslog_test.go b/command/agent/syslog_test.go
@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"os"
 	"runtime"
 	"testing"
 
@@ -10,8 +11,12 @@ import (
 
 func TestSyslogFilter(t *testing.T) {
 	if runtime.GOOS == "windows" {
-		t.SkipNow()
+		t.Skip("Syslog not supported on Windows")
 	}
+	if os.Getenv("TRAVIS") == "true" {
+		t.Skip("Syslog not supported on travis-ci")
+	}
+
 	l, err := gsyslog.NewLogger(gsyslog.LOG_NOTICE, "LOCAL0", "consul")
 	if err != nil {
 		t.Fatalf("err: %s", err)