Remove xvfb and set gkswstype to nul

albheim · albheim · commit 29bc209cdd9e · 2020-11-23T21:46:49.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,6 @@ addons:
   apt:
     packages:
       - libgtk-3-dev
-      - xvfb
       - dvipng
       - texlive
 cache:
@@ -25,15 +24,12 @@ cache:
   - $HOME/.julia/artifacts
 
 env:
-  - PLOTS_TEST="true" GKSwstype="100"
+  - PLOTS_TEST="true" GKSwstype="nul"
 
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  # Needed for plotting on travis
-  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
-  - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
+  - julia -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
 
 after_success:
     - julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
-    - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
-    - $TESTCMD --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate();import ControlSystems; cd(joinpath(dirname(pathof(ControlSystems)), "..")); include(joinpath("docs", "make.jl"))'
+    - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate();import ControlSystems; cd(joinpath(dirname(pathof(ControlSystems)), "..")); include(joinpath("docs", "make.jl"))'
diff --git a/docs/make.jl b/docs/make.jl
@@ -1,6 +1,6 @@
 # Set plot globals
 ENV["PLOTS_TEST"] = "true"
-ENV["GKSwstype"] = "100"
+ENV["GKSwstype"] = "nul"
 
 using Documenter, ControlSystems, Plots, LinearAlgebra, DSP
 import GR # Bug with world age in Plots.jl, see https://github.com/JuliaPlots/Plots.jl/issues/1047
diff --git a/test/test_plots.jl b/test/test_plots.jl
@@ -1,6 +1,6 @@
 # Set plot globals
 ENV["PLOTS_TEST"] = "true"
-ENV["GKSwstype"] = "100"
+ENV["GKSwstype"] = "nul"
 
 using Plots
 gr()
