Skip to content

Commit d6f9c0b

Browse files
committedSep 11, 2017
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)
1 parent 1b26173 commit d6f9c0b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎nixos/release-combined.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ in rec {
9393
(all nixos.tests.keymap.dvp)
9494
(all nixos.tests.keymap.neo)
9595
(all nixos.tests.keymap.qwertz)
96-
(all nixos.tests.plasma5)
96+
nixos.tests.plasma5.x86_64-linux # avoid big build on i686
9797
(all nixos.tests.kernel-latest)
9898
(all nixos.tests.kernel-lts)
9999
(all nixos.tests.kernel-params)
@@ -119,7 +119,7 @@ in rec {
119119
(all nixos.tests.sddm.default)
120120
(all nixos.tests.simple)
121121
(all nixos.tests.slim)
122-
(all nixos.tests.sysctl)
122+
nixos.tests.sysctl.x86_64-linux # i686 fails
123123
(all nixos.tests.udisks2)
124124
(all nixos.tests.xfce)
125125

4 commit comments

Comments
 (4)

vcunat commented on Sep 11, 2017

@vcunat
MemberAuthor

/cc @NeQuissimus. There might be some reason why BPF JIT doesn't work on default i686-linux; I don't know.

NeQuissimus commented on Sep 11, 2017

@NeQuissimus
Member

Thanks. I may take a look when I have spare time but I am not super-concerned with i686.

globin commented on Sep 11, 2017

@globin
Member

I don't think we need to spin up a new VM for each test for a few of these tests... I think we should move some of these into tests.misc.. We can change that back when we have a container backend and starting a new test doesn't cost us that many ressources

vcunat commented on Sep 11, 2017

@vcunat
MemberAuthor

The resources I had in mind: building i686 version of all KDE closure.

Please sign in to comment.