Skip to content

Commit

Permalink
Remove tests from Mac build until I got mac for tests of scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
aensidhe committed Oct 27, 2016
1 parent c671263 commit ba2973f
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@ services:
before_script:
- .travis/$TRAVIS_OS_NAME/init.sh
- dotnet restore
- docker -v
- docker-compose down
- docker-compose up -d
- pushd samples/docker-compose
- docker-compose down
- docker-compose up -d --build
- popd

script:
- dotnet build -f netcoreapp1.0 src/tarantool.client
- dotnet test tests/tarantool.client.tests
- curl -o /dev/null --fail http://localhost:5000
- .travis/$TRAVIS_OS_NAME/test.sh
12 changes: 11 additions & 1 deletion .travis/linux/init.sh
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
#!/usr/bin/env bash
#!/usr/bin/env bash

echo 'Linux init script'

docker -v
docker-compose down
docker-compose up -d
pushd samples/docker-compose
docker-compose down
docker-compose up -d --build
popd
6 changes: 6 additions & 0 deletions .travis/linux/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

echo 'Linux test script'

dotnet test tests/tarantool.client.tests
curl -o /dev/null --fail http://localhost:5000
1 change: 1 addition & 0 deletions .travis/osx/init.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash

echo 'Mac init script'
brew tap caskroom/cask
brew cask install docker
3 changes: 3 additions & 0 deletions .travis/osx/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

echo 'Mac test script'

0 comments on commit ba2973f

Please sign in to comment.