fix using local projects when testing (#311)

* fix using local projects when testing
JuliaLang · May 30, 2018 · 4f0d960 · 4f0d960
1 parent b0a7c14
commit 4f0d960
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 5 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-author = "Some One"
+authors = ["Some One <[email protected]>"]
 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
@@ -1,6 +1,6 @@
+authors = ["Some One <[email protected]>"]
 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
@@ -1,6 +1,6 @@
+authors = ["Some One <[email protected]>"]
 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
@@ -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
@@ -0,0 +1,7 @@
+authors = ["Some One <[email protected]>"]
+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
@@ -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
@@ -0,0 +1,4 @@
+using LibFoo
+using Test
+
+@test 1 == 1
diff --git 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