overlays: remove disable-flakey-tests: everything there only applied to emulated builds, which i no longer do
This commit is contained in:
parent
27af0002c8
commit
15f353f883
|
@ -200,7 +200,6 @@
|
||||||
# hence the weird redundancy.
|
# hence the weird redundancy.
|
||||||
default = final: prev: self.overlays.pkgs final prev;
|
default = final: prev: self.overlays.pkgs final prev;
|
||||||
sane-all = final: prev: import ./overlays/all.nix final prev;
|
sane-all = final: prev: import ./overlays/all.nix final prev;
|
||||||
disable-flakey-tests = final: prev: import ./overlays/disable-flakey-tests.nix final prev;
|
|
||||||
pkgs = final: prev: import ./overlays/pkgs.nix final prev;
|
pkgs = final: prev: import ./overlays/pkgs.nix final prev;
|
||||||
pins = final: prev: import ./overlays/pins.nix final prev;
|
pins = final: prev: import ./overlays/pins.nix final prev;
|
||||||
preferences = final: prev: import ./overlays/preferences.nix final prev;
|
preferences = final: prev: import ./overlays/preferences.nix final prev;
|
||||||
|
|
|
@ -6,7 +6,6 @@ final: prev:
|
||||||
let
|
let
|
||||||
pkgs = import ./pkgs.nix;
|
pkgs = import ./pkgs.nix;
|
||||||
preferences = import ./preferences.nix;
|
preferences = import ./preferences.nix;
|
||||||
disable-flakey-tests = import ./disable-flakey-tests.nix;
|
|
||||||
optimizations = import ./optimizations.nix;
|
optimizations = import ./optimizations.nix;
|
||||||
cross = import ./cross.nix;
|
cross = import ./cross.nix;
|
||||||
|
|
||||||
|
@ -20,7 +19,6 @@ in
|
||||||
renderOverlays [
|
renderOverlays [
|
||||||
pkgs
|
pkgs
|
||||||
preferences
|
preferences
|
||||||
disable-flakey-tests
|
|
||||||
(ifCross optimizations)
|
(ifCross optimizations)
|
||||||
(ifCross cross)
|
(ifCross cross)
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,63 +0,0 @@
|
||||||
# disable tests for packages which flake.
|
|
||||||
# tests will fail for a variety of reasons:
|
|
||||||
# - they were coded with timeouts that aren't reliable under heavy load.
|
|
||||||
# - they assume a particular architecture (e.g. x86) whereas i compile on multiple archs.
|
|
||||||
# - they assume too much about their environment and fail under qemu.
|
|
||||||
#
|
|
||||||
(next: prev:
|
|
||||||
let
|
|
||||||
dontCheckFn = _: {
|
|
||||||
doCheck = false;
|
|
||||||
doInstallCheck = false;
|
|
||||||
};
|
|
||||||
dontCheck = p: p.overrideAttrs dontCheckFn;
|
|
||||||
aarch64Only = f: p: p.overrideAttrs (upstream:
|
|
||||||
next.lib.optionalAttrs
|
|
||||||
(p.stdenv.targetPlatform.system == "aarch64-linux")
|
|
||||||
(f upstream)
|
|
||||||
);
|
|
||||||
emulatedOnly = f: p: p.overrideAttrs (upstream:
|
|
||||||
next.lib.optionalAttrs
|
|
||||||
(p.stdenv.targetPlatform.system == "aarch64-linux" && p.stdenv.buildPlatform.system == "aarch64-linux")
|
|
||||||
(f upstream)
|
|
||||||
);
|
|
||||||
# only `dontCheck` if the package is being built for aarch64
|
|
||||||
dontCheckAarch64 = aarch64Only dontCheckFn;
|
|
||||||
dontCheckEmulated = emulatedOnly dontCheckFn;
|
|
||||||
in {
|
|
||||||
# 2023/07/27
|
|
||||||
# 4 tests fail when building `hostPkgs.moby.emulated.elfutils`
|
|
||||||
elfutils = dontCheckEmulated prev.elfutils;
|
|
||||||
|
|
||||||
# 2023/10/30: 71/71 gjs:Scripts / CommandLine TIMEOUT 30.58s killed by signal 15 SIGTERM
|
|
||||||
gjs = dontCheckEmulated prev.gjs;
|
|
||||||
|
|
||||||
# 2023/07/31
|
|
||||||
# tests just hang after mini-record-2
|
|
||||||
# only for binfmt-emulated aarch64 -> aarch64 build
|
|
||||||
gnutls = dontCheckEmulated prev.gnutls;
|
|
||||||
|
|
||||||
# 2023/07/31
|
|
||||||
# tests fail (not timeout), but only when cross compiling, and not on servo (so, due to binfmt?)
|
|
||||||
# gupnp = dontCheckAarch64 prev.gupnp;
|
|
||||||
|
|
||||||
# hangs during checkPhase (or maybe it just takes 20-30 minutes)
|
|
||||||
# libqmi = dontCheckEmulated prev.libqmi;
|
|
||||||
|
|
||||||
# 2023/07/28
|
|
||||||
# "7/7 libwacom:all / pytest TIMEOUT 30.36s killed by signal 15 SIGTERM"
|
|
||||||
# N.B.: it passes on x86_64, but only if it's not CPU starved (i.e. nix build with -j1 if it fails)
|
|
||||||
# libwacom = aarch64Only (_: {
|
|
||||||
# doCheck = false;
|
|
||||||
# mesonFlags = [ "-Dtests=disabled" ];
|
|
||||||
# }) prev.libwacom;
|
|
||||||
|
|
||||||
# 2023/02/22; 2023/10/30
|
|
||||||
# "27/38 tracker:core / service TIMEOUT 60.37s killed by signal 15 SIGTERM"
|
|
||||||
tracker = dontCheckEmulated prev.tracker;
|
|
||||||
|
|
||||||
# 2023/07/31
|
|
||||||
# fails a test (didn't see which one)
|
|
||||||
# only for binfmt-emulated aarch64 -> aarch64 build
|
|
||||||
umockdev = dontCheckEmulated prev.umockdev;
|
|
||||||
})
|
|
Loading…
Reference in New Issue
Block a user