From c1795e7310dc45ad605b01b7e9f801ea3755ee09 Mon Sep 17 00:00:00 2001 From: Matti Pastell Date: Wed, 3 Jan 2018 08:48:01 +0200 Subject: [PATCH] Fix Gadfly tests --- src/display_methods.jl | 6 +++--- test/REQUIRE | 2 ++ test/documents/test_hold_ref.md | 6 ------ test/runtests.jl | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/display_methods.jl b/src/display_methods.jl index c02723e..81da8ab 100644 --- a/src/display_methods.jl +++ b/src/display_methods.jl @@ -39,9 +39,9 @@ function Base.display(report::Report, data) continue end #Always show plain text as well for term mode - if m ≠ "text/plain" && report.cur_chunk.options[:term] - display(report, "text/plain", data) - end + #if m ≠ "text/plain" && report.cur_chunk.options[:term] + # display(report, "text/plain", data) + #end break end end diff --git a/test/REQUIRE b/test/REQUIRE index de97a8f..5fbb00b 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -1,5 +1,7 @@ julia 0.6 Cairo +Fontconfig +Gadfly GR DSP Plots diff --git a/test/documents/test_hold_ref.md b/test/documents/test_hold_ref.md index e2b0d13..abb20fc 100644 --- a/test/documents/test_hold_ref.md +++ b/test/documents/test_hold_ref.md @@ -52,7 +52,6 @@ julia> x = 1:10 1:10 julia> plot(x = x, y = x) -Plot(...) ~~~~~~~~~~~~~ @@ -64,7 +63,6 @@ Plot(...) julia> print(x) 1:10 julia> plot(x = x, y = x) -Plot(...) ~~~~~~~~~~~~~ @@ -91,7 +89,6 @@ julietta> x = 1:10 1:10 julietta> plot(x = x, y = x) -Plot(...) ~~~~~~~~~~~~~ @@ -103,7 +100,6 @@ Plot(...) julietta> print(x) 1:10 julietta> plot(x = x, y = x) -Plot(...) ~~~~~~~~~~~~~ @@ -184,7 +180,6 @@ julia> x = 1:10 1:10 julia> plot(x = x, y = x) -Plot(...) ~~~~~~~~~~~~~ @@ -196,7 +191,6 @@ Plot(...) julia> print(x) 1:10 julia> plot(x = x, y = x) -Plot(...) ~~~~~~~~~~~~~ diff --git a/test/runtests.jl b/test/runtests.jl index c3aa404..748d1c1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -17,8 +17,8 @@ include("rich_output.jl") info("Test: Caching") include("cache_test.jl") -#info("Test: Chunk options with Gadfly") -#include("chunk_opts_gadfly.jl") +info("Test: Chunk options with Gadfly") +include("chunk_opts_gadfly.jl") #info("Test: Weaving with Gadfly") #include("gadfly_formats.jl")