summary refs log tree commit diff
path: root/nixos/release-combined.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-09-11 07:35:19 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-09-11 07:35:19 +0200
commitd6f9c0b35390bbd7b61d589c6c1f18c728d6461d (patch)
tree15a774e6d49be42e5b8950b421e68b6d022834b8 /nixos/release-combined.nix
parent1b261730f262a974a37126004b2df29e5f7f67cd (diff)
nixos tests: restrict sysctl and plasma5 to x86_64-linux
- sysctl is new and never succeeded on i686-linux
  > cannot stat /proc/sys/net/core/bpf_jit_enable: No such file or directory
- testing plasma5 on i686 would defeat part of the reason why we ended
  supporting i686 (lots of stuff built on Hydra)
Diffstat (limited to 'nixos/release-combined.nix')
-rw-r--r--nixos/release-combined.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 6e921ba7fb9f1..a7ceb104b577a 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -93,7 +93,7 @@ in rec {
         (all nixos.tests.keymap.dvp)
         (all nixos.tests.keymap.neo)
         (all nixos.tests.keymap.qwertz)
-        (all nixos.tests.plasma5)
+        nixos.tests.plasma5.x86_64-linux # avoid big build on i686
         (all nixos.tests.kernel-latest)
         (all nixos.tests.kernel-lts)
         (all nixos.tests.kernel-params)
@@ -119,7 +119,7 @@ in rec {
         (all nixos.tests.sddm.default)
         (all nixos.tests.simple)
         (all nixos.tests.slim)
-        (all nixos.tests.sysctl)
+        nixos.tests.sysctl.x86_64-linux # i686 fails
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)