From c618e0577ac71770af5fcb7016cb8216026a7923 Mon Sep 17 00:00:00 2001
From: Thomas Breloff <tom@breloff.com>
Date: Fri, 29 Apr 2016 10:49:11 -0400
Subject: [PATCH] travis and tests

---
 .travis.yml      | 46 ++++++++++++++++++++++++++++------------------
 test/REQUIRE     |  2 --
 test/runtests.jl | 32 ++++++++++++++++----------------
 3 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dee8962b..5142099c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,27 @@
 # Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
-os:
-  - linux
-  - osx
+# os:
+#   - linux
+#   - osx
 julia:
   - 0.4
   #- nightly
-
-
-addons:
-  apt:
-    packages:
-      - wkhtmltopdf
-
-before install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wkhtmltopdf; fi
-
-
+#
+#
+# # addons:
+# #   apt:
+# #     packages:
+# #       - wkhtmltopdf
+# #
+# # before install:
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wkhtmltopdf; fi
+#
+#
 # sudo: required
 # before_install:
 #   - sudo apt-get -qq update
-#   - sudo apt-get install wkhtmltopdf-dbg -y
+#   - sudo apt-get install -y wkhtmltopdf
 
 # # borrowed from Blink.jl's travis file
 # matrix:
@@ -33,6 +33,16 @@ before install:
 #       julia: 0.4
 #       env: TESTCMD="julia"
 
+matrix:
+  include:
+    - os: linux
+      sudo: required
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install -y wkhtmltopdf
+    - os: osx
+
+
 notifications:
   email: true
 # uncomment the following lines to override the default test script
@@ -46,8 +56,8 @@ script:
  # - julia -e 'Pkg.clone("https://github.com/tbreloff/ImageMagick.jl.git"); Pkg.checkout("ImageMagick","tb_write"); Pkg.build("ImageMagick")'
  # - julia -e 'Pkg.clone("https://github.com/tbreloff/VisualRegressionTests.jl.git");'
  - julia -e 'Pkg.clone("https://github.com/tbreloff/ExamplePlots.jl.git");'
- - julia -e 'Pkg.clone("https://github.com/JunoLab/Blink.jl.git"); Pkg.build("Blink"); import Blink; Blink.AtomShell.install()'
- - julia -e 'Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")'
+ # - julia -e 'Pkg.clone("https://github.com/JunoLab/Blink.jl.git"); Pkg.build("Blink"); import Blink; Blink.AtomShell.install()'
+ # - julia -e 'Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")'
  # - julia -e 'Pkg.add("Cairo"); Pkg.build("Cairo")'
  - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")'
 
diff --git a/test/REQUIRE b/test/REQUIRE
index 97f743aa..3a5eafbd 100644
--- a/test/REQUIRE
+++ b/test/REQUIRE
@@ -6,9 +6,7 @@ Requires
 FactCheck
 Cairo
 Gadfly
-Immerse
 Images
-PlotlyJS
 PyPlot
 @osx QuartzImageIO
 GR
diff --git a/test/runtests.jl b/test/runtests.jl
index eaa60bde..d6d03617 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -37,27 +37,27 @@ facts("Plotly") do
     @fact plotly() --> Plots.PlotlyBackend()
     @fact backend() --> Plots.PlotlyBackend()
 
-    # # until png generation is reliable on OSX, just test on linux
-    # @linux_only image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
+    # until png generation is reliable on OSX, just test on linux
+    @linux_only image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
 end
 
 
-facts("Immerse") do
-    @fact immerse() --> Plots.ImmerseBackend()
-    @fact backend() --> Plots.ImmerseBackend()
-
-    # as long as we can plot anything without error, it should be the same as Gadfly
-    image_comparison_facts(:immerse, only=[1], eps=img_eps)
-end
+# facts("Immerse") do
+#     @fact immerse() --> Plots.ImmerseBackend()
+#     @fact backend() --> Plots.ImmerseBackend()
+#
+#     # as long as we can plot anything without error, it should be the same as Gadfly
+#     image_comparison_facts(:immerse, only=[1], eps=img_eps)
+# end
 
 
-facts("PlotlyJS") do
-    @fact plotlyjs() --> Plots.PlotlyJSBackend()
-    @fact backend() --> Plots.PlotlyJSBackend()
-
-    # as long as we can plot anything without error, it should be the same as Plotly
-    image_comparison_facts(:plotlyjs, only=[1], eps=img_eps)
-end
+# facts("PlotlyJS") do
+#     @fact plotlyjs() --> Plots.PlotlyJSBackend()
+#     @fact backend() --> Plots.PlotlyJSBackend()
+#
+#     # as long as we can plot anything without error, it should be the same as Plotly
+#     image_comparison_facts(:plotlyjs, only=[1], eps=img_eps)
+# end
 
 
 facts("UnicodePlots") do