Skip to content

Commit

Permalink
nixos tests: restrict sysctl and plasma5 to x86_64-linux
Browse files Browse the repository at this point in the history 
- 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)
  • Loading branch information
@vcunat
vcunat committed Sep 11, 2017
1 parent 1b26173 commit d6f9c0b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nixos/release-combined.nix
View file
Expand Up @@ -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)
Expand All @@ -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)

Expand Down

4 comments on commit d6f9c0b

@vcunat
Copy link
Member Author

@vcunat vcunat commented on d6f9c0b Sep 11, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@NeQuissimus
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@globin
Copy link
Member

@globin globin commented on d6f9c0b Sep 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member Author

@vcunat vcunat commented on d6f9c0b Sep 11, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.