From 4088cd81bb8fb08647594790e60b4d8234b7f80e Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Thu, 22 Sep 2016 12:41:25 +0200 Subject: [PATCH] no longer print bold by default in print_with_color --- base/client.jl | 2 +- base/test.jl | 4 ++-- test/misc.jl | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/base/client.jl b/base/client.jl index 6c1461795ca425..a6bc115ee6db8e 100644 --- a/base/client.jl +++ b/base/client.jl @@ -37,7 +37,7 @@ end # Create a docstring with an automatically generated list # of colors. const possible_formatting_symbols = [:normal, :bold, :default] -available_text_colors = collect(Iterators.filter(x -> !isa(x, Integer), keys(text_colors))) +available_text_colors = collect(filter(x -> !isa(x, Integer), keys(text_colors))) available_text_colors = cat(1, sort(intersect(available_text_colors, possible_formatting_symbols), rev=true), sort(setdiff( available_text_colors, possible_formatting_symbols))) diff --git a/base/test.jl b/base/test.jl index 136758f8df520f..5a03f12750f45d 100644 --- a/base/test.jl +++ b/base/test.jl @@ -593,7 +593,7 @@ function print_counts(ts::DefaultTestSet, depth, align, np = passes + c_passes if np > 0 - print_with_color(:green, lpad(string(np), pass_width, " "), " ") + print_with_color(:green, lpad(string(np), pass_width, " "), " "; bold = true) elseif pass_width > 0 # No passes at this level, but some at another level print(lpad(" ", pass_width), " ") @@ -617,7 +617,7 @@ function print_counts(ts::DefaultTestSet, depth, align, nb = broken + c_broken if nb > 0 - print_with_color(:yellow, lpad(string(nb), broken_width, " "), " ") + print_with_color(:yellow, lpad(string(nb), broken_width, " "), " "; bold = true) elseif broken_width > 0 # None broken at this level, but some at another level print(lpad(" ", broken_width), " ") diff --git a/test/misc.jl b/test/misc.jl index 22da818e55a9aa..fb514aa8f726cc 100644 --- a/test/misc.jl +++ b/test/misc.jl @@ -452,14 +452,6 @@ if is_windows() end end -# CRC32c checksum (test data generated from @andrewcooke's CRC.jl package) -for force_software_crc in (1,0) - ccall(:jl_crc32c_init, Void, (Cint,), force_software_crc) - for (n,crc) in [(0,0x00000000),(1,0xa016d052),(2,0x03f89f52),(3,0xf130f21e),(4,0x29308cf4),(5,0x53518fab),(6,0x4f4dfbab),(7,0xbd3a64dc),(8,0x46891f81),(9,0x5a14b9f9),(10,0xb219db69),(11,0xd232a91f),(12,0x51a15563),(13,0x9f92de41),(14,0x4d8ae017),(15,0xc8b74611),(16,0xa0de6714),(17,0x672c992a),(18,0xe8206eb6),(19,0xc52fd285),(20,0x327b0397),(21,0x318263dd),(22,0x08485ccd),(23,0xea44d29e),(24,0xf6c0cb13),(25,0x3969bba2),(26,0x6a8810ec),(27,0x75b3d0df),(28,0x82d535b1),(29,0xbdf7fc12),(30,0x1f836b7d),(31,0xd29f33af),(32,0x8e4acb3e),(33,0x1cbee2d1),(34,0xb25f7132),(35,0xb0fa484c),(36,0xb9d262b4),(37,0x3207fe27),(38,0xa024d7ac),(39,0x49a2e7c5),(40,0x0e2c157f),(41,0x25f7427f),(42,0x368c6adc),(43,0x75efd4a5),(44,0xa84c5c31),(45,0x0fc817b2),(46,0x8d99a881),(47,0x5cc3c078),(48,0x9983d5e2),(49,0x9267c2db),(50,0xc96d4745),(51,0x058d8df3),(52,0x453f9cf3),(53,0xb714ade1),(54,0x55d3c2bc),(55,0x495710d0),(56,0x3bddf494),(57,0x4f2577d0),(58,0xdae0f604),(59,0x3c57c632),(60,0xfe39bbb0),(61,0x6f5d1d41),(62,0x7d996665),(63,0x68c738dc),(64,0x8dfea7ae)] - @test Base.crc32c(UInt8[1:n;]) == crc - end -end - let old_have_color = Base.have_color try