use travis ci new infrastructure

use go 1.4.3 in travis ci, add timeout for curl in test.sh
shadowsocks · Dec 2, 2015 · dbe5178 · dbe5178
1 parent 2390b7f
commit dbe5178
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-  - 1.4.2
+  - 1.4.3
 install:
   - go get golang.org/x/crypto/blowfish
   - go get golang.org/x/crypto/cast5
@@ -10,3 +10,4 @@ install:
   - go install ./cmd/shadowsocks-server
 script:
   - PATH=$PATH:$HOME/gopath/bin bash -x ./script/test.sh
+sudo: false
diff --git a/script/test.sh b/script/test.sh
@@ -47,7 +47,7 @@ test_get() {
     # -s silent to disable progress meter, but enable --show-error
     # -i to include http header
     # -L to follow redirect so we should always get HTTP 200
-    cont=`curl --socks5 $SOCKS -s --show-error -i -L $url 2>&1`
+    cont=`curl -m 5 --socks5 $SOCKS -s --show-error -i -L $url 2>&1`
     ok=`echo $cont | grep -E -o "HTTP/1\.1 +$code"`
     html=`echo $cont | grep -E -o -i "$target"`
     if [[ -z $ok || -z $html ]] ; then