Skip to content

Commit

Permalink
Fix Travis-CI test.
Browse files Browse the repository at this point in the history
  • Loading branch information
cyfdecyf committed Sep 21, 2014
1 parent 4eb3db9 commit 5052b3e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
language: go
go:
- 1.1
- 1.3
install:
- go get github.com/cyfdecyf/leakybuf
- go get code.google.com/p/go.crypto/blowfish
- go get code.google.com/p/go.crypto/cast5
- pushd $TRAVIS_BUILD_DIR
- go install ./cmd/shadowsocks-local
- go install ./cmd/shadowsocks-server
- popd
script:
- pushd $TRAVIS_BUILD_DIR
- PATH=$PATH:$HOME/gopath/bin bash -x ./script/test.sh
- popd
6 changes: 5 additions & 1 deletion script/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,18 @@ test_shadowsocks() {

# Wait server and client finish startup.
sleeptime=0.1
if echo $SERVER $LOCAL | grep 'py'; then
if [ -n "$TRAVIS" ]; then
# On Travis we need to wait a little longer.
sleeptime=1
elif echo $SERVER $LOCAL | grep 'py'; then
# The python version is slow to start.
if [[ $method == "table" ]]; then
sleeptime=2
else
sleeptime=0.5
fi
fi
echo $sleeptime
sleep $sleeptime

for i in {1..3}; do
Expand Down

0 comments on commit 5052b3e

Please sign in to comment.