gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

julia: move skipped tests from vendored patches to package code

Browse Source
This commit is contained in:
Sergey Volkov
2025-10-29 15:21:16 +01:00
parent 81cf417d43
commit e1147dbecd
5 changed files with 40 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/julia/default.nix
-7
View File
@@ -52,7 +52,6 @@ in
version = "1.10.10";
hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys=";
patches = [
./patches/1.10/0002-skip-failing-and-flaky-tests.patch
# Revert https://github.com/JuliaLang/julia/pull/55354
# [build] Some improvements to the LLVM build system
# Related: https://github.com/JuliaLang/julia/issues/55617
@@ -68,18 +67,12 @@ in
callPackage (import ./generic.nix {
version = "1.11.7";
hash = "sha256-puluy9YAV8kdx6mfwbN1F7Nhot+P0cRv/a0dm86Jln0=";
patches = [
./patches/1.11/0002-skip-failing-and-flaky-tests.patch
];
}) { }
);
julia_112 = wrapJulia (
callPackage (import ./generic.nix {
version = "1.12.1";
hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI=";
patches = [
./patches/1.12/0001-skip-failing-and-flaky-tests.patch
];
}) { }
);
}
pkgs/development/compilers/julia/generic.nix
+40 -3
View File
@@ -1,7 +1,7 @@
{
version,
hash,
patches,
patches ? [ ],
}:
{
@@ -21,6 +21,33 @@
buildPackages,
}:
let
skip_tests = [
# test flaky on ofborg
"channels"
# test flaky
"read"
"NetworkOptions"
"REPL"
"ccall"
]
++ lib.optionals (lib.versionAtLeast version "1.11") [
"loading"
"cmdlineargs"
]
++ lib.optionals (lib.versionAtLeast version "1.12") [
"Distributed"
# test flaky because of our RPATH patching
# https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
"Compiler/codegen"
"precompile"
"compileall"
]
++ lib.optionals (lib.versionOlder version "1.12") [
"compiler/codegen" # older versions' test was in lowercase
];
in
stdenv.mkDerivation rec {
pname = "julia";
@@ -93,8 +120,6 @@ stdenv.mkDerivation rec {
# tests are flaky for aarch64-linux on hydra
doInstallCheck = if (lib.versionOlder version "1.10") then !stdenv.hostPlatform.isAarch64 else true;
installCheckTarget = "testall";
preInstallCheck = ''
export JULIA_TEST_USE_MULTIPLE_WORKERS="true"
# Some tests require read/write access to $HOME.
@@ -102,6 +127,18 @@ stdenv.mkDerivation rec {
export HOME=$(mktemp -d)
'';
installCheckPhase = ''
runHook preInstallCheck
# Command lifted from `test/Makefile`.
$out/bin/julia \
--check-bounds=yes \
--startup-file=no \
--depwarn=error \
$out/share/julia/test/runtests.jl \
--skip internet_required ${toString skip_tests}
runHook postInstallCheck
'';
dontStrip = true;
enableParallelBuilding = true;
pkgs/development/compilers/julia/patches/1.10/0002-skip-failing-and-flaky-tests.patch
-25
View File
@@ -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
pkgs/development/compilers/julia/patches/1.11/0002-skip-failing-and-flaky-tests.patch
-25
View File
@@ -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 loading cmdlineargs $@)
$(addprefix revise-, $(TESTS)): revise-% :
@cd $(SRCDIR) && \
--
2.43.0
pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch
-25
View File
@@ -1,25 +0,0 @@
From e26b82d0c162b6c22b65b2a5d2cd03d98fd9f5d4 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Thu, 9 Oct 2025 13:00:31 +0200
Subject: [PATCH] disable failing and flaky tests
---
test/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/Makefile b/test/Makefile
index 69b7ad1451..583e64a287 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -30,7 +30,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 loading cmdlineargs Distributed precompile compileall $@)
$(addprefix revise-, $(TESTS)): revise-% :
@cd $(SRCDIR) && \
--
2.51.0