diff --git a/.travis.yml b/.travis.yml index fb9a97a2..31817d0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,10 @@ before_install: notifications: email: true # uncomment the following lines to override the default test script -script: - - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia -e 'import Pkg; Pkg.add(Pkg.PackageSpec(path=pwd())); Pkg.build("Plots")' - - julia test/travis_commands.jl +# script: + # - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi + # - julia -e 'import Pkg; Pkg.add(Pkg.PackageSpec(path=pwd())); Pkg.build("Plots")' + # - julia test/travis_commands.jl # - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")' # - julia -e 'Pkg.clone("GR"); Pkg.build("GR")' # # - julia -e 'Pkg.clone("https://github.com/tbreloff/ImageMagick.jl.git"); Pkg.checkout("ImageMagick","tb_write"); Pkg.build("ImageMagick")' diff --git a/appveyor.yml b/appveyor.yml index e43c45b6..15796f23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,5 +38,4 @@ build_script: Pkg.build(\"Plots\")" test_script: - # - C:\projects\julia\bin\julia -e "Pkg.test(\"Plots\")" - - C:\projects\julia\bin\julia test\travis_commands.jl + - C:\projects\julia\bin\julia -e "using Pkg; Pkg.test(\"Plots\")" diff --git a/test/travis_commands.jl b/test/add_packages.jl similarity index 85% rename from test/travis_commands.jl rename to test/add_packages.jl index cd6363ec..655ec4d6 100644 --- a/test/travis_commands.jl +++ b/test/add_packages.jl @@ -4,10 +4,7 @@ using Pkg # ENV["PYTHON"] = "" Pkg.add([ - PackageSpec("ImageMagick"), - # PackageSpec("GR"), PackageSpec(url="https://github.com/JuliaPlots/PlotReferenceImages.jl.git"), - PackageSpec("StatPlots"), # PackageSpec(url="https://github.com/JuliaStats/KernelDensity.jl.git"), PackageSpec(name="PlotUtils", rev="master"), PackageSpec(name="RecipesBase", rev="master"), @@ -25,5 +22,3 @@ Pkg.build("ImageMagick") # import Blink # Blink.AtomShell.install() # Pkg.build("PyPlot") - -Pkg.test("Plots"; coverage=false) diff --git a/test/runtests.jl b/test/runtests.jl index fd9f00bf..61d0e049 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,5 +1,6 @@ module PlotsTests +include("add_packages.jl") include("imgcomp.jl") # don't actually show the plots