Skip to content

Commit

Permalink
Fix tests for Julia 1.3, Windows SZIP is broken again
Browse files Browse the repository at this point in the history
  • Loading branch information
mkitti committed Aug 20, 2023
1 parent 21a195d commit b7860d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions test/filter.jl
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,10 @@ using HDF5.Filters: ExternalFilter, isavailable, isencoderenabled, isdecoderenab
@test HDF5.API.h5z_filter_avail(HDF5.API.H5Z_FILTER_NBIT)
@test HDF5.API.h5z_filter_avail(HDF5.API.H5Z_FILTER_SCALEOFFSET)
@test HDF5.API.h5z_filter_avail(HDF5.API.H5Z_FILTER_SHUFFLE)
@static if Sys.iswindows() ||
VERSION v"1.6" ||
@static if Sys.iswindow()
# This broke again on Windows
@test_broken HDF5.API.h5z_filter_avail(HDF5.API.H5Z_FILTER_SZIP)
elseif VERSION v"1.6" ||
HDF5.API.h5_get_libversion() >= v"1.14.0"
# SZIP via libaec_jll should be available in HDF5_jll 1.14 builds and beyond
@test HDF5.API.h5z_filter_avail(HDF5.API.H5Z_FILTER_SZIP)
Expand Down
3 changes: 2 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ using HDF5
using Test
using Pkg
filter_path = joinpath(dirname(pathof(HDF5)), "..", "filters")
if VERSION > v"1.3" && !Base.BinaryPlatforms.CPUID.test_cpu_feature(Base.BinaryPlatforms.CPUID.JL_X86_avx2)
if VERSION > v"1.3" &&
!Base.BinaryPlatforms.CPUID.test_cpu_feature(Base.BinaryPlatforms.CPUID.JL_X86_avx2)
Pkg.add(PackageSpec(; name="Blosc_jll", version=v"1.21.2+0"))
end
Pkg.develop([
Expand Down

0 comments on commit b7860d7

Please sign in to comment.