From a16012b6630f8cbaf287bf6a9ac7f73aa76368a5 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 25 Aug 2017 10:57:12 +0200 Subject: [PATCH 1/3] start tests from .travis.yml --- .travis.yml | 2 +- test/travis_commands.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbeac50e..e7770d63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,5 +55,5 @@ script: # - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")' # # # - $TESTCMD -e 'Pkg.test("Plots"; coverage=false)' - # - julia -e 'Pkg.test("Plots"; coverage=false)' + - julia -e 'Pkg.test("Plots"; coverage=false)' # # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())' diff --git a/test/travis_commands.jl b/test/travis_commands.jl index 4befaaef..de212b5b 100644 --- a/test/travis_commands.jl +++ b/test/travis_commands.jl @@ -28,4 +28,4 @@ Pkg.build("PyPlot") # Pkg.add("InspectDR") -Pkg.test("Plots"; coverage=false) +# Pkg.test("Plots"; coverage=false) From 64f364f71dc951e6cee1e331240a2100a01d22bd Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 25 Aug 2017 11:14:22 +0200 Subject: [PATCH 2/3] Pkg.clone(PyPlot) --- .travis.yml | 2 +- test/travis_commands.jl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7770d63..bbeac50e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,5 +55,5 @@ script: # - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")' # # # - $TESTCMD -e 'Pkg.test("Plots"; coverage=false)' - - julia -e 'Pkg.test("Plots"; coverage=false)' + # - julia -e 'Pkg.test("Plots"; coverage=false)' # # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())' diff --git a/test/travis_commands.jl b/test/travis_commands.jl index de212b5b..576bf07f 100644 --- a/test/travis_commands.jl +++ b/test/travis_commands.jl @@ -23,9 +23,9 @@ Pkg.checkout("PlotUtils") # need this to use Conda ENV["PYTHON"] = "" -Pkg.add("PyPlot") +Pkg.clone("PyPlot") Pkg.build("PyPlot") # Pkg.add("InspectDR") -# Pkg.test("Plots"; coverage=false) +Pkg.test("Plots"; coverage=false) From c0dd091bee82a0484fbec08fba51b8132b958bd2 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Fri, 25 Aug 2017 11:35:12 +0200 Subject: [PATCH 3/3] run travis_commands.jl before script --- .travis.yml | 5 +++-- appveyor.yml | 4 ++-- test/travis_commands.jl | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbeac50e..f75f3a59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ before_install: notifications: email: true # uncomment the following lines to override the default test script -script: +before_script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")' - julia test/travis_commands.jl @@ -54,6 +54,7 @@ script: # # - julia -e 'Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")' # - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")' # + script: # # - $TESTCMD -e 'Pkg.test("Plots"; coverage=false)' - # - julia -e 'Pkg.test("Plots"; coverage=false)' + - julia -e 'Pkg.test("Plots"; coverage=false)' # # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())' diff --git a/appveyor.yml b/appveyor.yml index cc07d84a..ef746f4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ build_script: # Need to convert from shallow to complete for Pkg.clone to work - IF EXIST .git\shallow (git fetch --unshallow) - C:\projects\julia\bin\julia -e "versioninfo(); Pkg.clone(pwd(), \"Plots\"); Pkg.build(\"Plots\")" + - C:\projects\julia\bin\julia -e "include(Pkg.dir(\"Plots\", \"test\", \"travis_commands.jl\"))" test_script: - # - C:\projects\julia\bin\julia -e "Pkg.test(\"Plots\")" - - C:\projects\julia\bin\julia -e "include(Pkg.dir(\"Plots\", \"test\", \"travis_commands.jl\"))" + - C:\projects\julia\bin\julia -e "Pkg.test(\"Plots\")" diff --git a/test/travis_commands.jl b/test/travis_commands.jl index 576bf07f..de212b5b 100644 --- a/test/travis_commands.jl +++ b/test/travis_commands.jl @@ -23,9 +23,9 @@ Pkg.checkout("PlotUtils") # need this to use Conda ENV["PYTHON"] = "" -Pkg.clone("PyPlot") +Pkg.add("PyPlot") Pkg.build("PyPlot") # Pkg.add("InspectDR") -Pkg.test("Plots"; coverage=false) +# Pkg.test("Plots"; coverage=false)