diff options
Diffstat (limited to 'pkgs/development/compilers/julia/patches')
4 files changed, 0 insertions, 130 deletions
diff --git a/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch deleted file mode 100644 index 474653bf342c..000000000000 --- a/pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9da2f2596db9f4f1a61825d82d9b8c3f3b2e99aa Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Wed, 10 Jan 2024 20:58:20 -0500 -Subject: [PATCH 2/2] skip failing and flaky tests - ---- - test/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Makefile b/test/Makefile -index 88dbe5b2b4..a2a7a55e20 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -28,7 +28,7 @@ default: - - $(TESTS): - @cd $(SRCDIR) && \ -- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) -+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall $@) - - $(addprefix revise-, $(TESTS)): revise-% : - @cd $(SRCDIR) && \ --- -2.43.0 - diff --git a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch deleted file mode 100644 index 243a9cfd76ae..000000000000 --- a/pkgs/development/compilers/julia/patches/1.6-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp <pontus@stenetorp.se> -Date: Thu, 8 Apr 2021 04:37:44 +0000 -Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox - -Disabled by default due to lack of networking in the Nix sandbox. This -greatly speeds up the build process on a multi-core system. ---- - test/runtests.jl | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..2f8c19fa32 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -- n = min(Sys.CPU_THREADS, length(tests)) -+ if net_on || haskey(ENV, "NIX_BUILD_CORES") -+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS -+ n = min(x, Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end --- -2.29.3 - diff --git a/pkgs/development/compilers/julia/patches/1.9-bin/0001-allow-skipping-internet-required-tests.patch b/pkgs/development/compilers/julia/patches/1.9-bin/0001-allow-skipping-internet-required-tests.patch deleted file mode 100644 index fc7d40a54d49..000000000000 --- a/pkgs/development/compilers/julia/patches/1.9-bin/0001-allow-skipping-internet-required-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/share/julia/test/choosetests.jl b/share/julia/test/choosetests.jl -index 334ef05..db5f795 100644 ---- a/share/julia/test/choosetests.jl -+++ b/share/julia/test/choosetests.jl -@@ -31,6 +31,19 @@ const TESTNAMES = [ - "smallarrayshrink", "opaque_closure", "filesystem", "download", - ] - -+const INTERNET_REQUIRED_LIST = [ -+ "Artifacts", -+ "Downloads", -+ "LazyArtifacts", -+ "LibCURL", -+ "LibGit2", -+ "Pkg", -+ "download", -+ "TOML", -+] -+ -+const NETWORK_REQUIRED_LIST = vcat(INTERNET_REQUIRED_LIST, ["Sockets"]) -+ - """ - `(; tests, net_on, exit_on_error, seed) = choosetests(choices)` selects a set of tests to be - run. `choices` should be a vector of test names; if empty or set to -@@ -149,6 +162,7 @@ function choosetests(choices = []) - filtertests!(tests, "compiler/EscapeAnalysis", [ - "compiler/EscapeAnalysis/local", "compiler/EscapeAnalysis/interprocedural"]) - filtertests!(tests, "stdlib", STDLIBS) -+ filtertests!(tests, "internet_required", INTERNET_REQUIRED_LIST) - # do ambiguous first to avoid failing if ambiguities are introduced by other tests - filtertests!(tests, "ambiguous") - -@@ -164,16 +178,7 @@ function choosetests(choices = []) - filter!(x -> x != "rounding", tests) - end - -- net_required_for = filter!(in(tests), [ -- "Artifacts", -- "Downloads", -- "LazyArtifacts", -- "LibCURL", -- "LibGit2", -- "Sockets", -- "download", -- "TOML", -- ]) -+ net_required_for = filter!(in(tests), NETWORK_REQUIRED_LIST) - net_on = true - JULIA_TEST_NETWORKING_AVAILABLE = get(ENV, "JULIA_TEST_NETWORKING_AVAILABLE", "") |> - strip |> diff --git a/pkgs/development/compilers/julia/patches/1.9/0002-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.9/0002-skip-failing-and-flaky-tests.patch deleted file mode 100644 index 966c805ad7ae..000000000000 --- a/pkgs/development/compilers/julia/patches/1.9/0002-skip-failing-and-flaky-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0e1fe51ce93847ac3c4de49a003d9762b2f3d7c6 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 20 Sep 2022 18:42:59 +0800 -Subject: [PATCH 2/2] skip failing and flaky tests - ---- - test/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Makefile b/test/Makefile -index 24e137a5b1..e78f12da04 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -23,7 +23,7 @@ default: - - $(TESTS): - @cd $(SRCDIR) && \ -- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@) -+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip MozillaCACerts_jll --skip NetworkOptions --skip channels $@) - - $(addprefix revise-, $(TESTS)): revise-% : - @cd $(SRCDIR) && \ --- -2.38.1 - |