@@ -245,7 +245,7 @@ function hijack(packagemod::Module, modname=nothing; parentmodule::Module=Main,
245
245
end
246
246
247
247
if packagemod === Base
248
- hijack_base (ChooseTests . BASETESTS ,
248
+ hijack_base (:_Base_tests ,
249
249
base= modname, parentmodule= parentmodule, lazy= lazy, revise= revise)
250
250
elseif startswith (packagepath, Sys. STDLIB) # packagemod is an STDLIB
251
251
hijack_base (string (packagemod), modname,
@@ -483,6 +483,12 @@ const BASETESTPATH = joinpath(Sys.BINDIR, "..", "share", "julia", "test")
483
483
function call_choosetests (choices)
484
484
isdefined (ChooseTests, :STDLIBS ) ||
485
485
include (joinpath (BASETESTPATH, " choosetests.jl" ))
486
+
487
+ if choices === :_Base_tests
488
+ # we compute choices lazily, as in recent Julia versions, TESTNAMES is defined
489
+ # globally in choosetests.jl, and therefore defined only after the include above
490
+ choices = filter (x -> x != " stdlib" , TESTNAMES)
491
+ end
486
492
Base. invokelatest (choosetests, choices)
487
493
end
488
494
@@ -501,7 +507,8 @@ function test_path(test)
501
507
end
502
508
end
503
509
504
- const TESTNAMES = [
510
+ if VERSION < v " 1.8.0-DEV.34"
511
+ const TESTNAMES = [
505
512
" subarray" , " core" , " compiler" , " worlds" ,
506
513
" keywordargs" , " numbers" , " subtype" ,
507
514
" char" , " strings" , " triplequote" , " unicode" , " intrinsics" ,
@@ -525,9 +532,8 @@ const TESTNAMES = [
525
532
" channels" , " iostream" , " secretbuffer" , " specificity" ,
526
533
" reinterpretarray" , " syntax" , " corelogging" , " missing" , " asyncmap" ,
527
534
" smallarrayshrink" , " opaque_closure"
528
- ]
529
-
530
- const BASETESTS = filter (x -> x != " stdlib" , TESTNAMES)
535
+ ]
536
+ end
531
537
532
538
const BLACKLIST = [
533
539
# failing at load time (in hijack_base)
0 commit comments