From 3d3d034a99bcf345d10d7f871d651d461e9dcad0 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Thu, 12 Nov 2020 11:36:12 -0500
Subject: [PATCH 1/2] update travis test file

---
 .travis.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9dcf4ff..1e12df2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 language: julia
-os:
-  - linux
+os: linux
+dist: xenial
 julia:
-  - 1.0
+  - 1.0 # LTS
+  - 1 # currently 1.5
   - nightly
+branches:
+  only:
+    - master
 notifications:
   email: false
-script:
-  - julia -e 'using Pkg; Pkg.build(); Pkg.test("CoverageBase"; coverage=true)'
-  - julia -e 'using Pkg; Pkg.add(PackageSpec(name="Coverage", rev="master")); using Coverage; Codecov.submit(Codecov.process_folder())'
+codecov: true

From 1b314d28df920c31d3b463acbe8bd07aff0be774 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Thu, 12 Nov 2020 11:14:38 -0500
Subject: [PATCH 2/2] Updates needed on Julia v1.6

- handle a Test.TestSetException return result
- use correct LOAD_PATH (just stdlib)
---
 Manifest.toml       | 98 ---------------------------------------------
 src/CoverageBase.jl | 19 +++++++--
 2 files changed, 16 insertions(+), 101 deletions(-)
 delete mode 100644 Manifest.toml

diff --git a/Manifest.toml b/Manifest.toml
deleted file mode 100644
index 86ecb2a..0000000
--- a/Manifest.toml
+++ /dev/null
@@ -1,98 +0,0 @@
-# This file is machine-generated - editing it directly is not advised
-
-[[Base64]]
-uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
-
-[[BinaryProvider]]
-deps = ["Libdl", "Logging", "SHA"]
-git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648"
-uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-version = "0.5.6"
-
-[[Coverage]]
-deps = ["HTTP", "JSON", "LibGit2", "MbedTLS"]
-git-tree-sha1 = "f9780daf3fea51ad2d7b7ed4f480ac34ab36587f"
-uuid = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
-version = "0.9.2"
-
-[[Dates]]
-deps = ["Printf"]
-uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
-
-[[Distributed]]
-deps = ["Random", "Serialization", "Sockets"]
-uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
-
-[[HTTP]]
-deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
-git-tree-sha1 = "03ddc88af7f2d963fac5aa9f3ac8e11914d68a78"
-uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "0.8.4"
-
-[[IniFile]]
-deps = ["Test"]
-git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
-uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
-version = "0.5.0"
-
-[[InteractiveUtils]]
-deps = ["Markdown"]
-uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
-
-[[JSON]]
-deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
-uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.0"
-
-[[LibGit2]]
-uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
-
-[[Libdl]]
-uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-
-[[Logging]]
-uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
-
-[[Markdown]]
-deps = ["Base64"]
-uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
-
-[[MbedTLS]]
-deps = ["BinaryProvider", "Dates", "Distributed", "Libdl", "Random", "Sockets", "Test"]
-git-tree-sha1 = "2d94286a9c2f52c63a16146bb86fd6cdfbf677c6"
-uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
-version = "0.6.8"
-
-[[Mmap]]
-uuid = "a63ad114-7e13-5084-954f-fe012c677804"
-
-[[Parsers]]
-deps = ["Dates", "Test"]
-git-tree-sha1 = "db2b35dedab3c0e46dc15996d170af07a5ab91c9"
-uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "0.3.6"
-
-[[Printf]]
-deps = ["Unicode"]
-uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-
-[[Random]]
-deps = ["Serialization"]
-uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-
-[[SHA]]
-uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
-
-[[Serialization]]
-uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
-
-[[Sockets]]
-uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
-
-[[Test]]
-deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
-uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
-[[Unicode]]
-uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
diff --git a/src/CoverageBase.jl b/src/CoverageBase.jl
index 3185314..3c2444d 100644
--- a/src/CoverageBase.jl
+++ b/src/CoverageBase.jl
@@ -156,11 +156,24 @@ function runtests(names)
     testdir = joinpath(topdir, "test")
     julia = julia_cmd()
     script = """
-        using Distributed # from runtests.jl
+        push!(empty!(LOAD_PATH), "@stdlib") # don't inherit CoverageBase's Manifest
+        using Distributed, Test # from runtests.jl
         print_testworker_started(swallow...) = nothing
         include("testdefs.jl")
-        @time testresult = runtests(ARGS[1], ARGS[2])
-        # TODO: exit(testresult.anynonpass ? 1 : 0)
+        let
+            @time testresult = runtests(ARGS[1], ARGS[2])[1]
+            if testresult isa Test.TestSetException
+                for t in testresult.errors_and_fails
+                    show(t)
+                    println()
+                end
+                if testresult.fail + testresult.error > 0
+                    throw(testresult)
+                end
+            elseif testresult isa Exception
+                throw(testresult)
+            end
+        end
         """
     anyfail = false
     cd(testdir) do