add test for JuliaLang/julia#34680

Author: KristofferC

test/runtests.jl

@@ -5,7 +5,7 @@ using Pkg
 
 ENV["JULIA_DEBUG"] = "PackageCompiler"
 
-# Make a new depot
+# Make a new depot to test stuff in
 new_depot = mktempdir()
 mkpath(joinpath(new_depot, "registries"))
 cp(joinpath(DEPOT_PATH[1], "registries", "General"), joinpath(new_depot, "registries", "General"))
@@ -18,29 +18,49 @@ if haskey(ENV, "CI")
     @show Sys.ARCH
 end
 
-@testset "PackageCompiler.jl" begin
-    new_project = mktempdir()
-    old_project = Base.ACTIVE_PROJECT[]
-    Base.ACTIVE_PROJECT[] = new_project
-    try
-        Pkg.add("Example")
-    finally
-        Base.ACTIVE_PROJECT[] = old_project
+
+@testset "Sysimage" begin
+
+new_project = mktempdir()
+old_project = Base.ACTIVE_PROJECT[]
+Base.ACTIVE_PROJECT[] = new_project
+try
+    Pkg.add("Example")
+finally
+    Base.ACTIVE_PROJECT[] = old_project
+end
+tmp = mktempdir()
+sysimage_path = joinpath(tmp, "sys." * Libdl.dlext)
+script = tempname()
+write(script, "script_func() = println(\"I am a script\")")
+
+create_sysimage(:Example; sysimage_path=sysimage_path,
+                          project=new_project,
+                          precompile_execution_file="precompile_execution.jl",
+                          precompile_statements_file=["precompile_statements.jl",
+                                                      "precompile_statements2.jl"],
+                          script=script)
+# Check we can load sysimage and that Example is available in Main
+str = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e 'println(Example.hello("foo")); script_func()'`, String)
+@test occursin("Hello, foo", str)
+@test occursin("I am a script", str)
+
+end # sysimage
+
+
+@testset "App" begin
+
+tmp = mktempdir()
+app_source_dir = joinpath(@__DIR__, "..", "examples/MyApp/")
+# TODO: Also test something that actually gives audit warnings
+@test_logs PackageCompiler.audit_app(app_source_dir)
+app_compiled_dir = joinpath(tmp, "MyAppCompiled")
+for incremental in (is_slow_ci ? (false,) : (true, false))
+    if incremental == false
+        filter_stdlibs = (is_slow_ci ? (true, ) : (true, false))
+    else
+        filter_stdlibs = (false,)
     end
-    tmp = mktempdir()
-    sysimage_path = joinpath(tmp, "sys." * Libdl.dlext)
-    script = tempname()
-    write(script, "script_func() = println(\"I am a script\")")
-    create_sysimage(:Example; sysimage_path=sysimage_path,
-                              project=new_project,
-                              precompile_execution_file=joinpath(@__DIR__, "precompile_execution.jl"),
-                              precompile_statements_file=joinpath.(@__DIR__, ["precompile_statements.jl",
-                                                                              "precompile_statements2.jl"]),
-                              script=script)
-    # Check we can load sysimage and that Example is available in Main
-    str = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e 'println(Example.hello("foo")); script_func()'`, String)
-    @test occursin("Hello, foo", str)
-    @test occursin("I am a script", str)
 
     # Test creating an app
     app_source_dir = joinpath(@__DIR__, "..", "examples/MyApp/")
@@ -84,13 +104,69 @@ end
             @test occursin("HelloWorld artifact at $(realpath(app_compiled_dir))", app_output)
         end
     end
-    # Test creating an empty sysimage
-    if !is_slow_ci
-        tmp = mktempdir()
-        sysimage_path = joinpath(tmp, "empty." * Libdl.dlext)
-        foreach(x -> touch(joinpath(tmp, x)), ["Project.toml", "Manifest.toml"])
-        create_sysimage(; sysimage_path=sysimage_path, incremental=false, filter_stdlibs=true, project=tmp)
-        hello = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e 'print("hello, world")'`, String)
-        @test hello == "hello, world"
+end
+
+end # testset
+
+
+@testset "empty sysimage" begin
+
+if !is_slow_ci
+    tmp = mktempdir()
+    sysimage_path = joinpath(tmp, "empty." * Libdl.dlext)
+    foreach(x -> touch(joinpath(tmp, x)), ["Project.toml", "Manifest.toml"])
+    create_sysimage(; sysimage_path=sysimage_path, incremental=false, filter_stdlibs=true, project=tmp)
+    hello = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e 'print("hello, world")'`, String)
+    @test hello == "hello, world"
+end
+
+end # testset
+
+
+# Test for https://github.com/JuliaLang/julia/issues/34680
+@testset "ccall absolute path" begin
+
+tmpdir = mktempdir()
+open(joinpath(tmpdir, "libfoo.c"), "w") do io
+    write(io, """
+    #include <stdio.h>
+
+    void foo() {
+        printf("Hello, Foo!\\n");
+    }
+    """)
+end
+libfoo_libname = string("libfoo", ".", Libdl.dlext)
+cd(tmpdir) do
+    compiler = PackageCompiler.get_compiler()
+    cmd = `$compiler -o $libfoo_libname libfoo.c -shared -fPIC $(PackageCompiler.bitflag())`
+    PackageCompiler.run_with_env(cmd, compiler)
+
+    Pkg.generate("LibFoo")
+    open(joinpath("LibFoo", "src", "LibFoo.jl"), "w") do io
+        write(io, """
+        module LibFoo
+        const libfoo = $(repr(joinpath(tmpdir, libfoo_libname)))
+        f() = ccall((:foo, libfoo), Cvoid, ())
+        function __init__()
+            f()
+        end
+        end
+        """)
     end
 end
+
+prev = Base.ACTIVE_PROJECT[]
+Base.ACTIVE_PROJECT[] = joinpath(tmpdir, "LibFoo")
+
+try
+    sysimage_path = tempname()
+    create_sysimage(:LibFoo; sysimage_path=sysimage_path)
+    content = "using .LibFoo; LibFoo.f()"
+    str = read(`$(Base.julia_cmd()) -J $(sysimage_path) -e $content`, String)
+    @test occursin("Hello, Foo", str)
+finally
+    Base.ACTIVE_PROJECT[] = prev
+end
+
+end # testset