diff --git a/.github/workflows/SnoopCompile.yml b/.github/workflows/SnoopCompile.yml index 2cf9a1e4..57472b7e 100644 --- a/.github/workflows/SnoopCompile.yml +++ b/.github/workflows/SnoopCompile.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: julia --project -e 'using Pkg; Pkg.instantiate();' - name : Add SnoopCompile and current package - run: julia -e 'using Pkg; Pkg.add(PackageSpec(url = "https://github.com/aminya/SnoopCompile.jl", rev ="blacklist_snoopi")); Pkg.develop(PackageSpec(; path=pwd()));' + run: julia -e 'using Pkg; Pkg.add(PackageSpec(url = "https://github.com/timholy/SnoopCompile.jl", rev ="master")); Pkg.develop(PackageSpec(; path=pwd()));' - name: Install Test dependencies run: julia -e 'using SnoopCompile; SnoopCompile.addtestdep()' - name: Generating precompile files diff --git a/test/modules.jl b/test/modules.jl index 7cfa77f4..68fe02cd 100644 --- a/test/modules.jl +++ b/test/modules.jl @@ -24,6 +24,10 @@ let (parentfile, included_files) = modulefiles(Atom) expected = Set(atommodfiles) actual = Set((parentfile, included_files...)) + + println(expected) + println(actual) + @test actual == expected # can't detect display/webio.jl diff --git a/test/runtests.jl b/test/runtests.jl index f29b0d34..60f4318a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -8,11 +8,20 @@ atomsrcdir = joinpath′(atomjldir, "src") atomjlfile = joinpath′(atomsrcdir, "Atom.jl") webiofile = joinpath′(atomsrcdir, "display", "webio.jl") + + # files in `Atom` module (except files in its submodules) atommodfiles = let files = [] debuggerdir = joinpath′(atomsrcdir, "debugger") profilerdir = joinpath′(atomsrcdir, "profiler") + precompileDeactivated = !isnothing(match(r"\#(.?)include\(\"\.\.\/deps\/SnoopCompile\/precompile\/precompile_Atom\.jl\"\)", Base.read(atomjlfile, String))) + precompiledir = joinpath′(atomjldir, "deps", "SnoopCompile","precompile") + + if !precompileDeactivated + push!(files, joinpath′(precompiledir, "precompile_Atom.jl")) + end + for (d, ds, fs) in walkdir(atomsrcdir) # NOTE: update directories below when you create an new submodule # the 2 files below are in Atom module @@ -25,6 +34,7 @@ atommodfiles = let push!(files, joinpath′(d, "traceur.jl")) continue end + for f in fs # NOTE: currently both Revise-like and CSTPraser-based approach fails # to detect display/webio.jl as a file in Atom module