Skip to content

Commit

Permalink
Remove OS X from tests, seems incompatible
Browse files Browse the repository at this point in the history
Opened #24 for when
contributors want to do it.
  • Loading branch information
rugk committed Sep 22, 2017
1 parent 7f1aaa3 commit 00c38b2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
language: shell # (unofficial)
distro: trusty
sudo: false

os:
- linux
- osx
env:
# outdated/legacy
- TEST_SHELL=sh BORG=1.0.2 BORG_SOURCE=binary # old, Ubuntu Xenial
Expand All @@ -18,12 +16,6 @@ before_script:
# add custom binary path
- mkdir "$PWD/custombin/"
- export PATH="$PWD/custombin/:$PATH"
# install packages on OS X
# - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi' # disabled, as packages may already be there
- 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install shellcheck zsh; brew upgrade gpg; alias gpg="gpg2"; fi'
# set correct binary variant
- 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then export BORG_VARIANT=borg-macosx64; fi'
- 'if [ "$TRAVIS_OS_NAME" = "linux" ]; then export BORG_VARIANT=borg-linux64; fi'
# installing borg
- tests/helper/installBorg.sh
# install shunit2
Expand Down
1 change: 0 additions & 1 deletion tests/unitTests/borgcronStarter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ testExecuteSingleConfigExplicit(){
# do specify config to run explicitly
addConfigFile "singleConfig.sh"

$TEST_SHELL "$BASE_DIR/borgcron_starter.sh" singleConfig
assertTrue "no error when executing" \
"$TEST_SHELL '$BASE_DIR/borgcron_starter.sh' singleConfig"

Expand Down

0 comments on commit 00c38b2

Please sign in to comment.