diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-22 23:19:06 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-23 12:24:33 +0200 |
| commit | 8353ebe073efeecf31f3a67456f3bebbbdedd639 (patch) | |
| tree | 7e0787d0ad0a04ff9872a3b26ab5d896fcc0015b /nixos/release-combined.nix | |
| parent | ec0c4802ae89dccfbff1060fd411b46113e87671 (diff) | |
| download | nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.tar nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.tar.gz nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.tar.bz2 nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.tar.lz nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.tar.xz nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.tar.zst nixlib-8353ebe073efeecf31f3a67456f3bebbbdedd639.zip | |
nixos/release.nix: Introduce callSubTestsOnTheseSystems
The existing callSubTests seems to already have special-cased code to allow enabling subtests on a single specific system by looking at the `system` attribute in the test arguments. Replace it with a new version similar to the callTestOnTheseSystems because: - It's consistent with the existing functions for creating system-specific tests (though admittedly, the callSubTests special case for `system` predates them) - This approach allows limiting to multiple system types, the previous one inherently allows only one system type. - This also fixes the problem that if you pass in e.g. supportedSystems = [ "aarch64-linux" ], you end up with a tests.chromium job that silently runs on x86_64-linux. - Finally, this causes renames of the jobs like: tests.chromium -> tests.chromium.x86_64-linux to be consistent with the rest of the tests.
Diffstat (limited to 'nixos/release-combined.nix')
| -rw-r--r-- | nixos/release-combined.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6583b13b844e..3564e6298256 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -57,7 +57,7 @@ in rec { nixos.ova.x86_64-linux #(all nixos.tests.containers) - nixos.tests.chromium + nixos.tests.chromium.x86_64-linux (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) |