|
88 | 88 | jdep_buildver = JSON.lower(dep_buildver)
|
89 | 89 | @test jdep_buildver == Dict("type" => "dependency", "name" => name, "uuid" => nothing, "compat" => "~1.2", "version-major" => 0x0, "version-minor" => 0x0, "version-patch" => 0x0, "platforms" => ["x86_64-linux-gnu-cxx11"])
|
90 | 90 | # the build_version is currently not serialized, so the following test fails
|
91 |
| - @test_broken dependencify(jdep_buildver) == dep_buildver |
| 91 | + @test dependencify(jdep_buildver) == dep_buildver broken=true |
92 | 92 |
|
93 | 93 | jbuild_dep = JSON.lower(build_dep)
|
94 | 94 | @test jbuild_dep == Dict("type" => "builddependency", "name" => build_name, "uuid" => nothing, "compat" => "", "version-major" => 0x0, "version-minor" => 0x0, "version-patch" => 0x0, "platforms" => ["any"])
|
@@ -126,14 +126,14 @@ end
|
126 | 126 | platform = HostPlatform()
|
127 | 127 | ap = @test_logs setup_dependencies(prefix, getpkg.(dependencies), platform)
|
128 | 128 | @test "libz." * platform_dlext(platform) in readdir(last(libdirs(Prefix(destdir(dir, platform)))))
|
129 |
| - @test "zlib.h" in readdir(joinpath(destdir(dir, platform), "include")) |
| 129 | + @test sort!(readdir(joinpath(destdir(dir, platform), "include"))) == ["zconf.h", "zlib.h"] |
130 | 130 |
|
131 |
| - if os(platform) == "macos" |
132 |
| - zlib_log_files = ["Zlib.log.gz", "fix_identity_mismatch_libz.1.2.11.dylib.log.gz", "ldid_libz.1.2.11.dylib.log.gz"] |
| 131 | + zlib_log_files = if os(platform) == "macos" |
| 132 | + ["Zlib.log.gz", "fix_identity_mismatch_libz.1.2.11.dylib.log.gz", "ldid_libz.1.2.11.dylib.log.gz"] |
133 | 133 | else
|
134 |
| - zlib_log_files = ["Zlib.log.gz"] |
| 134 | + ["Zlib.log.gz"] |
135 | 135 | end
|
136 |
| - @test readdir(joinpath(destdir(dir, platform), "logs")) == zlib_log_files |
| 136 | + @test sort!(readdir(joinpath(destdir(dir, platform), "logs"))) == zlib_log_files |
137 | 137 |
|
138 | 138 | # Make sure the directories are emptied by `cleanup_dependencies`
|
139 | 139 | @test_nowarn cleanup_dependencies(prefix, ap, platform)
|
|
156 | 156 | # Make sure the directories are emptied by `cleanup_dependencies`
|
157 | 157 | @test_nowarn cleanup_dependencies(prefix, ap, platform)
|
158 | 158 | # This shuld be empty, but the `curl/` directory is left here, empty
|
159 |
| - @test_broken readdir(joinpath(destdir(dir, platform), "include")) == [] |
160 |
| - @test readdir(joinpath(destdir(dir, platform), "logs")) == [] |
| 159 | + @test readdir(joinpath(destdir(dir, platform), "include")) == [] broken=true |
| 160 | + # Since Julia v1.9 we use builds of LibCURL and its dependencies which have logs |
| 161 | + # in subdirectories of `${prefix}/logs`, so we have the same problem as above: |
| 162 | + # those subdirectories are left there empty, cannot be removed by |
| 163 | + # `cleanup_dependencies`. |
| 164 | + @test readdir(joinpath(destdir(dir, platform), "logs")) == [] broken=VERSION≥v"1.9.0-DEV" |
161 | 165 | end
|
162 | 166 |
|
163 | 167 | # Setup a dependency that doesn't have a mapping for the given platform
|
|
0 commit comments