Skip to content

Commit 50eadde

Browse files
don't use pkgimages if any includes fall in tracked path
1 parent 0371bf4 commit 50eadde

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

base/loading.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2721,6 +2721,11 @@ end
27212721
return true
27222722
end
27232723
end
2724+
tracked_path = if JLOptions().tracked_path == NULL
2725+
""
2726+
else
2727+
unsafe_string(JLOptions().tracked_path)
2728+
end
27242729
for chi in includes
27252730
f, ftime_req = chi.filename, chi.mtime
27262731
if !isfile(f)
@@ -2733,6 +2738,14 @@ end
27332738
@debug "Rejecting stale cache file $cachefile because file $f does not exist"
27342739
return true
27352740
end
2741+
if JLOptions().use_pkgimages != 0 && JLOptions().code_coverage == 3 && occursin(tracked_path, f)
2742+
@debug "Rejecting cache file $cachefile because included file $f is being tracked by --code-coverage=@$tracked_path"
2743+
return true
2744+
end
2745+
if JLOptions().use_pkgimages != 0 && JLOptions().malloc_log == 3 && occursin(tracked_path, f)
2746+
@debug "Rejecting cache file $cachefile because included file $f is being tracked by --track-allocation=@$tracked_path"
2747+
return true
2748+
end
27362749
ftime = mtime(f)
27372750
is_stale = ( ftime != ftime_req ) &&
27382751
( ftime != floor(ftime_req) ) && # Issue #13606, PR #13613: compensate for Docker images rounding mtimes

0 commit comments

Comments
 (0)