diff --git a/test/imgcomp.jl b/test/imgcomp.jl index 7b43da03..1b911499 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -22,7 +22,7 @@ default(size=(500,300)) # TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that # is referenced in a button press callback (the button clicked callback will call notify() on that condition) -const _current_plots_version = v"0.7.4" +const _current_plots_version = v"0.7.5" function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], eps = 1e-2) @@ -41,9 +41,10 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is fn = "ref$idx.png" # firgure out version info - G = glob(relpath(refdir) * "/*") + G = glob(joinpath(relpath(refdir), "*")) # @show refdir fn G - versions = map(fn -> VersionNumber(split(fn,"/")[end]), G) + slash = (@windows ? "\\" : "/") + versions = map(fn -> VersionNumber(split(fn, slash)[end]), G) versions = reverse(sort(versions)) versions = filter(v -> v <= _current_plots_version, versions) # @show refdir fn versions diff --git a/test/runtests.jl b/test/runtests.jl index 8d2e5b78..56dc55b8 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,7 +5,7 @@ include("imgcomp.jl") # don't actually show the plots srand(1234) default(show=false, reuse=true) -img_eps = 5e-2 +img_eps = isinteractive() ? 1e-2 : 10e-2 # facts("Gadfly") do # @fact gadfly() --> Plots.GadflyBackend() @@ -30,7 +30,7 @@ facts("GR") do @fact gr() --> Plots.GRBackend() @fact backend() --> Plots.GRBackend() - @linux_only image_comparison_facts(:gr, skip=[], eps=img_eps) + @linux_only image_comparison_facts(:gr, skip=[30], eps=img_eps) end facts("Plotly") do