From 0bd1bbae91a4d52f17cebd3822db35d538d6ae34 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Sun, 31 Oct 2021 22:06:21 -0400 Subject: [PATCH] `choosetests`: preparations for setting up a separate Buildkite job that runs the `Pkg` test suite (#42859) (cherry picked from commit b55fb5f2a8e4633e7cde4cd79fcc67e04747d54b) --- test/choosetests.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/choosetests.jl b/test/choosetests.jl index cbc9f82f89512..94dfb72792d99 100644 --- a/test/choosetests.jl +++ b/test/choosetests.jl @@ -93,6 +93,9 @@ function choosetests(choices = []) end end + explicit_pkg3 = ("Pkg" in tests) || ("Pkg/pkg" in tests) + explicit_libgit2 = "LibGit2/online" in tests + filtertests!(tests, "unicode", ["unicode/utf8"]) filtertests!(tests, "strings", ["strings/basic", "strings/search", "strings/util", "strings/io", "strings/types"]) @@ -132,8 +135,6 @@ function choosetests(choices = []) filter!(!in(skip_tests), tests) - explicit_pkg3 = "Pkg/pkg" in tests - explicit_libgit2 = "LibGit2/online" in tests new_tests = String[] for test in tests if test in STDLIBS @@ -149,7 +150,8 @@ function choosetests(choices = []) end filter!(x -> (x != "stdlib" && !(x in STDLIBS)) , tests) append!(tests, new_tests) - explicit_pkg3 || filter!(x -> x != "Pkg/pkg", tests) + explicit_pkg3 || filter!(x -> x != "Pkg", tests) + explicit_pkg3 || filter!(x -> x != "Pkg/pkg", tests) explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests) # Filter out tests from the test groups in the stdlibs