Skip to content

Commit 36304ba

Browse files
authored
Running make testall should run all of the tests (#42904)
1 parent 4304c51 commit 36304ba

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
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: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,13 @@ function choosetests(choices = [])
110110

111111
unhandled = copy(skip_tests)
112112

113-
if tests == ["all"] || isempty(tests)
114-
tests = TESTNAMES
113+
requested_all = "all" in tests
114+
requested_default = "default" in tests
115+
if isempty(tests) || requested_all || requested_default
116+
append!(tests, TESTNAMES)
115117
end
118+
filter!(x -> x != "all", tests)
119+
filter!(x -> x != "default", tests)
116120

117121
function filtertests!(tests, name, files=[name])
118122
flt = x -> (x != name && !(x in files))
@@ -125,7 +129,7 @@ function choosetests(choices = [])
125129
end
126130
end
127131

128-
explicit_pkg3 = "Pkg" in tests
132+
explicit_pkg = "Pkg" in tests
129133
explicit_libgit2 = "LibGit2/online" in tests
130134

131135
filtertests!(tests, "unicode", ["unicode/utf8"])
@@ -189,8 +193,9 @@ function choosetests(choices = [])
189193
end
190194
filter!(x -> (x != "stdlib" && !(x in STDLIBS)) , tests)
191195
append!(tests, new_tests)
192-
explicit_pkg3 || filter!(x -> x != "Pkg", tests)
193-
explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests)
196+
197+
requested_all || explicit_pkg || filter!(x -> x != "Pkg", tests)
198+
requested_all || explicit_libgit2 || filter!(x -> x != "LibGit2/online", tests)
194199

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

0 commit comments

Comments
 (0)