Skip to content

Commit dc8d2ec

Browse files
authored
Fix STDLIBDIR in test/Makefile. (#31623)
1 parent f23ecd5 commit dc8d2ec

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

test/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
22
JULIAHOME := $(abspath $(SRCDIR)/..)
33
BUILDDIR := .
4-
STDLIBDIR := $(abspath $(JULIAHOME)/stdlib)
54
include $(JULIAHOME)/Make.inc
5+
VERSDIR := v$(shell cut -d. -f1-2 < $(JULIAHOME)/VERSION)
6+
STDLIBDIR := $(build_datarootdir)/julia/stdlib/$(VERSDIR)
67
# TODO: this Makefile ignores BUILDDIR, except for computing JULIA_EXECUTABLE
78

89
TESTGROUPS = unicode strings compiler
910
TESTS = all stdlib $(TESTGROUPS) \
10-
$(patsubst $(STDLIBDIR)/%/,%,$(dir $(wildcard $(STDLIBDIR)/*/.))) \
11+
$(patsubst $(STDLIBDIR)/%/,%,$(dir $(wildcard $(STDLIBDIR)/*/.))) \
1112
$(filter-out runtests testdefs, \
1213
$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl))) \
1314
$(foreach group,$(TESTGROUPS), \

0 commit comments

Comments
 (0)