Skip to content

Commit

Permalink
Running make testall should run all of the tests (#42904)
Browse files Browse the repository at this point in the history
  • Loading branch information
DilumAluthge authored Nov 7, 2021
1 parent 4304c51 commit 36304ba
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ STDLIBDIR := $(build_datarootdir)/julia/stdlib/$(VERSDIR)
# TODO: this Makefile ignores BUILDDIR, except for computing JULIA_EXECUTABLE

TESTGROUPS = unicode strings compiler
TESTS = all stdlib $(TESTGROUPS) \
TESTS = all default stdlib $(TESTGROUPS) \
$(patsubst $(STDLIBDIR)/%/,%,$(dir $(wildcard $(STDLIBDIR)/*/.))) \
$(filter-out runtests testdefs, \
$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl))) \
Expand All @@ -19,7 +19,7 @@ EMBEDDING_ARGS := "JULIA=$(JULIA_EXECUTABLE)" "BIN=$(SRCDIR)/embedding" "CC=$(CC

GCEXT_ARGS := "JULIA=$(JULIA_EXECUTABLE)" "BIN=$(SRCDIR)/gcext" "CC=$(CC)"

default: all
default:

$(TESTS):
@cd $(SRCDIR) && \
Expand Down
15 changes: 10 additions & 5 deletions test/choosetests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,13 @@ function choosetests(choices = [])

unhandled = copy(skip_tests)

if tests == ["all"] || isempty(tests)
tests = TESTNAMES
requested_all = "all" in tests
requested_default = "default" in tests
if isempty(tests) || requested_all || requested_default
append!(tests, TESTNAMES)
end
filter!(x -> x != "all", tests)
filter!(x -> x != "default", tests)

function filtertests!(tests, name, files=[name])
flt = x -> (x != name && !(x in files))
Expand All @@ -125,7 +129,7 @@ function choosetests(choices = [])
end
end

explicit_pkg3 = "Pkg" in tests
explicit_pkg = "Pkg" in tests
explicit_libgit2 = "LibGit2/online" in tests

filtertests!(tests, "unicode", ["unicode/utf8"])
Expand Down Expand Up @@ -189,8 +193,9 @@ function choosetests(choices = [])
end
filter!(x -> (x != "stdlib" && !(x in STDLIBS)) , tests)
append!(tests, new_tests)
explicit_pkg3 || filter!(x -> x != "Pkg", tests)
explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests)

requested_all || explicit_pkg || filter!(x -> x != "Pkg", tests)
requested_all || explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests)

# Filter out tests from the test groups in the stdlibs
filter!(!in(tests), unhandled)
Expand Down

0 comments on commit 36304ba

Please sign in to comment.