Skip to content

Commit c7daef8

Browse files
DilumAluthgeKristofferC
authored andcommitted
Running make testall should run all of the tests (#42904)
(cherry picked from commit 36304ba)
1 parent 4eb2f43 commit c7daef8

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ STDLIBDIR := $(build_datarootdir)/julia/stdlib/$(VERSDIR)
77
# TODO: this Makefile ignores BUILDDIR, except for computing JULIA_EXECUTABLE
88

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

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

22-
default: all
22+
default:
2323

2424
$(TESTS):
2525
@cd $(SRCDIR) && \

test/choosetests.jl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function choosetests(choices = [])
9393
--seed=<SEED> : set the initial seed for all testgroups (parsed as a UInt128)
9494
--skip <NAMES>... : skip test or collection tagged with <NAMES>
9595
TESTS:
96-
Can be special tokens, such as "all", "unicode", "stdlib", the names of stdlib modules, or the names of any file in the TESTNAMES array (defaults to "all").
96+
Can be special tokens, such as "all", "unicode", "stdlib", the names of stdlib modules, or the names of any file in the testnames array (defaults to "all").
9797
9898
Or prefix a name with `-` (such as `-core`) to skip a particular test.
9999
""")
@@ -109,9 +109,13 @@ function choosetests(choices = [])
109109

110110
unhandled = copy(skip_tests)
111111

112-
if tests == ["all"] || isempty(tests)
113-
tests = testnames
112+
requested_all = "all" in tests
113+
requested_default = "default" in tests
114+
if isempty(tests) || requested_all || requested_default
115+
append!(tests, testnames)
114116
end
117+
filter!(x -> x != "all", tests)
118+
filter!(x -> x != "default", tests)
115119

116120
function filtertests!(tests, name, files=[name])
117121
flt = x -> (x != name && !(x in files))
@@ -124,7 +128,7 @@ function choosetests(choices = [])
124128
end
125129
end
126130

127-
explicit_pkg3 = "Pkg" in tests
131+
explicit_pkg = "Pkg" in tests
128132
explicit_libgit2 = "LibGit2/online" in tests
129133

130134
filtertests!(tests, "unicode", ["unicode/utf8"])
@@ -187,8 +191,9 @@ function choosetests(choices = [])
187191
end
188192
filter!(x -> (x != "stdlib" && !(x in STDLIBS)) , tests)
189193
append!(tests, new_tests)
190-
explicit_pkg3 || filter!(x -> x != "Pkg", tests)
191-
explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests)
194+
195+
requested_all || explicit_pkg || filter!(x -> x != "Pkg", tests)
196+
requested_all || explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests)
192197

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

0 commit comments

Comments
 (0)