Merge pull request #248 from shirosaki/osx

Add osx to travis

diff --git a/.travis.yml b/.travis.yml
index 101634f8342dd766097a74f040d471c4d911774b..a913cd75324b06f201d3a5b8afb8d34ec2c3b8bc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,19 @@
 language: vim
+
+os:
+  - linux
+  - osx
+
 env:
   - TEST=package
   - TEST=latest
 
 before_script: |
   if [ "$TEST" = "package" ]; then
-    sudo apt-get -y update
-    sudo apt-get -y install vim
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      sudo apt-get -y update
+      sudo apt-get -y install vim
+    fi
   else
     cd ..
     git clone --depth 1 https://github.com/vim/vim

diff --git a/test/syntax.vader b/test/syntax.vader
index f7828abb97efd2c0509676428549858058427f3e..e5618f353ba38a5b13ea01b8fb893f9ab0b62b4a 100644 (file)
--- a/test/syntax.vader
+++ b/test/syntax.vader
@@ -193,15 +193,17 @@ Given markdown;
 [a](b)
 
 Execute (conceal link):
-  setlocal conceallevel=2
-  AssertEqual synconcealed(1, 1)[0], 1
-  AssertEqual synconcealed(1, 2)[0], 0
-  AssertEqual synconcealed(1, 3)[0], 1
-  AssertEqual synconcealed(1, 4)[0], 1
-  AssertEqual synconcealed(1, 4)[0], 1
-  AssertEqual synconcealed(1, 5)[0], 1
-  AssertEqual synconcealed(1, 6)[0], 1
-  setlocal conceallevel=0
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    setlocal conceallevel=0
+  endif
 
 # Autolinks
 
@@ -501,13 +503,13 @@ a: b
 ---
 
 Execute (YAML frontmatter is controlled by the option):
-  AssertNotEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
   let g:vim_markdown_frontmatter=1
   syn off | syn on
-  AssertEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertEqual SyntaxOf('a')[0:3], 'yaml'
   let g:vim_markdown_frontmatter=0
   syn off | syn on
-  AssertNotEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
 
 Given markdown;
 
@@ -518,7 +520,7 @@ a: b
 Execute (YAML frontmatter only works if it's the first thing in the file):
   let g:vim_markdown_frontmatter=1
   syn off | syn on
-  AssertNotEqual SyntaxOf('a'), 'yamlBlockMappingKey'
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
 
 Given markdown;
 ---