Merge pull request #9678 from JuliaLang/teh/pkg_tests

Fix and test Pkg.test(pkg, coverage=true)

Author: tkelman

base/pkg/entry.jl

@@ -690,7 +690,7 @@ function test!(pkg::AbstractString, errs::Vector{AbstractString}, notests::Vecto
         cd(dirname(test_path)) do
             try
                 color = Base.have_color? "--color=yes" : "--color=no"
-                codecov = coverage? "--code-coverage=user --inline=no" : "--code-coverage=none"
+                codecov = coverage? ["--code-coverage=user", "--inline=no"] : ["--code-coverage=none"]
                 run(`$JULIA_HOME/julia --check-bounds=yes $codecov $color $test_path`)
                 info("$pkg tests passed")
             catch err

test/pkg.jl

@@ -76,3 +76,47 @@ temp_pkg_dir() do
     @test err.msg == "PackageWithFailingTests had test errors"
   end
 end
+
+# Testing with code-coverage
+@unix_only begin                 # TODO: delete unix_only when #8911, #9654 are fixed
+temp_pkg_dir() do
+  Pkg.generate("PackageWithCodeCoverage", "MIT", config=Dict("user.name"=>"Julia Test", "user.email"=>"[email protected]"))
+
+  src = """
+module PackageWithCodeCoverage
+
+export f1, f2, f3, untested
+
+f1(x) = 2x
+f2(x) = f1(x)
+function f3(x)
+    3x
+end
+untested(x) = 7
+
+end"""
+  linetested = [false, false, false, false, true, true, false, true, false, false]
+  open(Pkg.dir("PackageWithCodeCoverage", "src", "PackageWithCodeCoverage.jl"), "w") do f
+      println(f, src)
+  end
+  isdir(Pkg.dir("PackageWithCodeCoverage","test")) || mkdir(Pkg.dir("PackageWithCodeCoverage","test"))
+  open(Pkg.dir("PackageWithCodeCoverage", "test", "runtests.jl"),"w") do f
+    println(f,"using PackageWithCodeCoverage, Base.Test")
+    println(f,"@test f2(2) == 4")
+    println(f,"@test f3(5) == 15")
+  end
+
+  Pkg.test("PackageWithCodeCoverage")
+  covfile = Pkg.dir("PackageWithCodeCoverage","src","PackageWithCodeCoverage.jl.cov")
+  @test !isfile(covfile)
+  Pkg.test("PackageWithCodeCoverage", coverage=true)
+  @test isfile(covfile)
+  covstr = readall(covfile)
+  srclines = split(src, '\n')
+  covlines = split(covstr, '\n')
+  for i = 1:length(linetested)
+      covline = (linetested[i] ? "        1 " : "        - ")*srclines[i]
+      @test covlines[i] == covline
+  end
+end
+end