absolutify --project and JULIA_PROJECT paths

JuliaLang · Aug 13, 2018 · 0131a55 · 0131a55
1 parent d7e4584
commit 0131a55
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/base/initdefs.jl b/base/initdefs.jl
@@ -136,10 +136,10 @@ function init_load_path()
     end
     project = (JLOptions().project != C_NULL ?
         unsafe_string(Base.JLOptions().project) :
-        get(ENV, "JULIA_PROJECT", nothing))
+        get(ENV, "JULIA_PROJECT", ""))
     HOME_PROJECT[] =
         project == "" ? nothing :
-        project == "@." ? current_project() : project
+        project == "@." ? current_project() : abspath(project)
     append!(empty!(LOAD_PATH), paths)
 end
 

diff --git a/test/loading.jl b/test/loading.jl
@@ -547,6 +547,23 @@ finally
     popfirst!(LOAD_PATH)
 end
 
+@testset "absolute project paths" begin
+    # --project and JULIA_PROJECT paths should be absolute
+    mktempdir() do dir; cd(dir) do
+        mkdir("foo")
+        script = """
+        using Test
+        old = Base.active_project()
+        cd("foo")
+        @test Base.active_project() == old
+        """
+        @test success(`$(Base.julia_cmd()) --project=foo -e $(script)`)
+        withenv("JULIA_PROJECT" => "foo") do
+            @test success(`$(Base.julia_cmd()) -e $(script)`)
+        end
+    end; end
+end
+
 ## cleanup after tests ##
 
 for env in keys(envs)