From 4f0d960a85f114d93ddae8886ff60828072061f6 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Mon, 28 May 2018 22:28:05 +0200 Subject: [PATCH] fix using local projects when testing (#311) * fix using local projects when testing --- stdlib/Pkg/src/Operations.jl | 2 +- stdlib/Pkg/src/generate.jl | 2 +- stdlib/Pkg/test/test_packages/BigProject/Project.toml | 2 +- .../test/test_packages/BigProject/SubModule/Project.toml | 2 +- .../test/test_packages/BigProject/SubModule2/Project.toml | 2 +- .../test_packages/BigProject/test/LibFoo.jl/Manifest.toml | 8 ++++++++ .../test_packages/BigProject/test/LibFoo.jl/Project.toml | 7 +++++++ .../test_packages/BigProject/test/LibFoo.jl/src/LibFoo.jl | 5 +++++ .../BigProject/test/LibFoo.jl/test/runtests.jl | 4 ++++ stdlib/Pkg/test/test_packages/BigProject/test/runtests.jl | 5 +++++ 10 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Manifest.toml create mode 100644 stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Project.toml create mode 100644 stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/src/LibFoo.jl create mode 100644 stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/test/runtests.jl diff --git a/stdlib/Pkg/src/Operations.jl b/stdlib/Pkg/src/Operations.jl index a2c4b54868ce3..3c4587f85de9d 100644 --- a/stdlib/Pkg/src/Operations.jl +++ b/stdlib/Pkg/src/Operations.jl @@ -779,7 +779,7 @@ function with_dependencies_loadable_at_toplevel(f, mainctx::Context, pkg::Packag write_env(localctx, display_diff = false) will_resolve && build_versions(localctx, new) sep = Sys.iswindows() ? ';' : ':' - withenv(f, "JULIA_LOAD_PATH" => "$tmpdir$sep$(Types.stdlib_dir())") + withenv(f, "JULIA_LOAD_PATH" => "@$sep$tmpdir$sep$(Types.stdlib_dir())") end end diff --git a/stdlib/Pkg/src/generate.jl b/stdlib/Pkg/src/generate.jl index 35827604cdadf..f3aa91a49236b 100644 --- a/stdlib/Pkg/src/generate.jl +++ b/stdlib/Pkg/src/generate.jl @@ -47,10 +47,10 @@ function project(pkg::String, dir::String) genfile(pkg, dir, "Project.toml") do io print(io, """ + authors = $authorstr name = "$pkg" uuid = "$(UUIDs.uuid1())" version = "0.1.0" - authors = $authorstr [deps] """ diff --git a/stdlib/Pkg/test/test_packages/BigProject/Project.toml b/stdlib/Pkg/test/test_packages/BigProject/Project.toml index ac9f4153d546c..e547520892f1c 100644 --- a/stdlib/Pkg/test/test_packages/BigProject/Project.toml +++ b/stdlib/Pkg/test/test_packages/BigProject/Project.toml @@ -1,4 +1,4 @@ -author = "Some One" +authors = ["Some One "] name = "BigProject" uuid = "da7e1942-2519-11e8-2822-f5508ce758f0" version = "0.1.0" diff --git a/stdlib/Pkg/test/test_packages/BigProject/SubModule/Project.toml b/stdlib/Pkg/test/test_packages/BigProject/SubModule/Project.toml index 25e3dcaefdec4..551d2c4744f14 100644 --- a/stdlib/Pkg/test/test_packages/BigProject/SubModule/Project.toml +++ b/stdlib/Pkg/test/test_packages/BigProject/SubModule/Project.toml @@ -1,6 +1,6 @@ +authors = ["Some One "] name = "SubModule" uuid = "0d404dc8-25d6-11e8-300e-11c8e584fb95" version = "0.1.0" -author = ["Some One"] [deps] diff --git a/stdlib/Pkg/test/test_packages/BigProject/SubModule2/Project.toml b/stdlib/Pkg/test/test_packages/BigProject/SubModule2/Project.toml index 2627bffa5993f..7ae078a1f559d 100644 --- a/stdlib/Pkg/test/test_packages/BigProject/SubModule2/Project.toml +++ b/stdlib/Pkg/test/test_packages/BigProject/SubModule2/Project.toml @@ -1,6 +1,6 @@ +authors = ["Some One "] name = "SubModule2" uuid = "2d3cad7e-26b9-11e8-3e8d-a543003d541d" version = "0.1.0" -author = ["Some One"] [deps] diff --git a/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Manifest.toml b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Manifest.toml new file mode 100644 index 0000000000000..d61e0dc725f46 --- /dev/null +++ b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Manifest.toml @@ -0,0 +1,8 @@ +[[Example]] +deps = ["Test"] +git-tree-sha1 = "8eb7b4d4ca487caade9ba3e85932e28ce6d6e1f8" +uuid = "7876af07-990d-54b4-ab0e-23690620f79a" +version = "0.5.1" + +[[Test]] +uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Project.toml b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Project.toml new file mode 100644 index 0000000000000..8433b53bc5be1 --- /dev/null +++ b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/Project.toml @@ -0,0 +1,7 @@ +authors = ["Some One "] +name = "LibFoo" +uuid = "22d9ad80-6275-11e8-2737-a9b3d0e63aa9" +version = "0.1.0" + +[deps] +Example = "7876af07-990d-54b4-ab0e-23690620f79a" diff --git a/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/src/LibFoo.jl b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/src/LibFoo.jl new file mode 100644 index 0000000000000..0a866e2a1a505 --- /dev/null +++ b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/src/LibFoo.jl @@ -0,0 +1,5 @@ +module LibFoo + +greet() = print("Hello World!") + +end # module diff --git a/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/test/runtests.jl b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/test/runtests.jl new file mode 100644 index 0000000000000..2b474685fb611 --- /dev/null +++ b/stdlib/Pkg/test/test_packages/BigProject/test/LibFoo.jl/test/runtests.jl @@ -0,0 +1,4 @@ +using LibFoo +using Test + +@test 1 == 1 \ No newline at end of file diff --git a/stdlib/Pkg/test/test_packages/BigProject/test/runtests.jl b/stdlib/Pkg/test/test_packages/BigProject/test/runtests.jl index 25b018562f6f0..f6c0d960f01b1 100644 --- a/stdlib/Pkg/test/test_packages/BigProject/test/runtests.jl +++ b/stdlib/Pkg/test/test_packages/BigProject/test/runtests.jl @@ -4,3 +4,8 @@ using Example using BigProject @test BigProject.f() == 1 + +# #306 Pkg.jl +cd("LibFoo.jl") do + run(`$(Base.julia_cmd()) test/runtests.jl`) +end \ No newline at end of file