Skip to content

Commit 769342b

Browse files
FRidhFRidh
committedJan 24, 2018
Merge remote-tracking branch 'upstream/master' into HEAD
2 parents 9f22de7 + 9ffaa69 commit 769342b

File tree

68 files changed

+2735
-2148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2735
-2148
lines changed
 

Diff for: ‎nixos/release-combined.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ in rec {
5757
nixos.ova.x86_64-linux
5858

5959
#(all nixos.tests.containers)
60-
nixos.tests.chromium
60+
nixos.tests.chromium.x86_64-linux
6161
(all nixos.tests.firefox)
6262
(all nixos.tests.firewall)
6363
(all nixos.tests.gnome3)

Diff for: ‎nixos/release.nix

+8-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ let
1919
callTestOnTheseSystems = systems: fn: args: forTheseSystems systems (system: hydraJob (importTest fn args system));
2020
callTest = callTestOnTheseSystems supportedSystems;
2121

22-
callSubTests = fn: args: let
22+
callSubTests = callSubTestsOnTheseSystems supportedSystems;
23+
callSubTestsOnTheseSystems = systems: fn: args: let
2324
discover = attrs: let
2425
subTests = filterAttrs (const (hasAttr "test")) attrs;
2526
in mapAttrs (const (t: hydraJob t.test)) subTests;
@@ -28,10 +29,7 @@ let
2829
${system} = test;
2930
}) (discover (importTest fn args system));
3031

31-
# If the test is only for a particular system, use only the specified
32-
# system instead of generating attributes for all available systems.
33-
in if args ? system then discover (import fn args)
34-
else foldAttrs mergeAttrs {} (map discoverForSystem supportedSystems);
32+
in foldAttrs mergeAttrs {} (map discoverForSystem (intersectLists systems supportedSystems));
3533

3634
pkgs = import nixpkgs { system = "x86_64-linux"; };
3735

@@ -230,7 +228,7 @@ in rec {
230228
tests.boot = callSubTests tests/boot.nix {};
231229
tests.boot-stage1 = callTest tests/boot-stage1.nix {};
232230
tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {};
233-
tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
231+
tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable;
234232
tests.cjdns = callTest tests/cjdns.nix {};
235233
tests.cloud-init = callTest tests/cloud-init.nix {};
236234
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
@@ -250,9 +248,9 @@ in rec {
250248
tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {};
251249
tests.ecryptfs = callTest tests/ecryptfs.nix {};
252250
tests.etcd = callTestOnTheseSystems ["x86_64-linux"] tests/etcd.nix {};
253-
tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
254-
tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
255-
tests.elk = callSubTests tests/elk.nix { system = "x86_64-linux"; };
251+
tests.ec2-nixops = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops;
252+
tests.ec2-config = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config;
253+
tests.elk = callSubTestsOnTheseSystems ["x86_64-linux"] tests/elk.nix {};
256254
tests.env = callTest tests/env.nix {};
257255
tests.ferm = callTest tests/ferm.nix {};
258256
tests.firefox = callTest tests/firefox.nix {};
@@ -346,7 +344,7 @@ in rec {
346344
tests.tomcat = callTest tests/tomcat.nix {};
347345
tests.udisks2 = callTest tests/udisks2.nix {};
348346
tests.vault = callTest tests/vault.nix {};
349-
tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
347+
tests.virtualbox = callSubTestsOnTheseSystems ["x86_64-linux"] tests/virtualbox.nix {};
350348
tests.wordpress = callTest tests/wordpress.nix {};
351349
tests.xfce = callTest tests/xfce.nix {};
352350
tests.xmonad = callTest tests/xmonad.nix {};

0 commit comments

Comments
 (0)