Permalink
Browse files

Merge branch 'themis'

  • Loading branch information...
rhysd committed Nov 25, 2017
2 parents 1d839b1 + 5773ccc commit 25a0f8ed52b53662c12582f3b011fc96ca766550
Showing with 1,033 additions and 1,099 deletions.
  1. +21 −5 .travis.yml
  2. +8 −0 test/.themisrc
  3. +0 −3 test/Gemfile
  4. +0 −27 test/Guardfile
  5. +0 −13 test/Rakefile
  6. +0 −1 test/VimFlavor
  7. +0 −1,050 test/t/clever_f_spec.vim
  8. +1,004 −0 test/test.vimspec
View
@@ -1,7 +1,23 @@
language: ruby
language: generic
os:
- linux
- osx
osx_image: xcode9
dist: trusty
rvm:
- 1.9.3
script: rake ci
install:
- cd test && bundle install
- git clone --depth 1 https://github.com/thinca/vim-themis && (cd vim-themis && git show HEAD)
- |
if [[ "$TRAVIS_OS_NAME" == 'osx' ]]; then
brew update
HOMEBREW_NO_AUTO_UPDATE=1 brew install macvim
fi
before_script:
- uname -a
- vim --version
script:
- ./vim-themis/bin/themis test/
View
@@ -0,0 +1,8 @@
let g:Expect = themis#helper('expect')
let g:repo_root = fnamemodify(expand('<sfile>'), ':h:h')
call themis#option('exclude', g:repo_root . '/test/README.md')
call themis#option('exclude', g:repo_root . '/test/Guardfile')
call themis#helper('command').with(themis#helper('assert'))
call themis#option('runtimepath', expand(g:repo_root))
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 25a0f8e

Please sign in to comment.