git.iko.soy/typeable/nixpkgs
on master help sign in
systems: fix lib-tests

These were broken by the added system doubles. This just adds those to the lib-tests.

commit0fef9f89e4cedfa87d44b814629a9b94af8667a9 authorMatthew Bauer <mjbauer95@gmail.com> dateTue 4 Jun 2019, 14:49 (7 years ago) parent22039a1
3 files changed+8−5
lib/systems/doubles.nix+2 lib/systems/inspect.nix+1 lib/tests/systems.nix+5−5
lib/systems/doubles.nix+2
@@ -57,5 +57,7 @@ in rec {
5757 wasi = filterDoubles predicates.isWasi;
5858 windows = filterDoubles predicates.isWindows;
5959
60+ embedded = filterDoubles predicates.isNone;
61+
6062 mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];
6163}
lib/systems/inspect.nix+1
@@ -44,6 +44,7 @@ rec {
4444 isCygwin = { kernel = kernels.windows; abi = abis.cygnus; };
4545 isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
4646 isWasi = { kernel = kernels.wasi; };
47+ isNone = { kernel = kernels.none; };
4748
4849 isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
4950 isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
lib/tests/systems.nix+5−5
@@ -12,19 +12,19 @@ let
1212 expected = lib.sort lib.lessThan y;
1313 };
1414in with lib.systems.doubles; lib.runTests {
15− testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows);
15+ testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded);
1616
17− testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
18− testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];
17+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" ];
18+ testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" ];
1919 testmips = mseteq mips [ "mipsel-linux" ];
20− testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" ];
20+ testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
2121
2222 testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
2323 testdarwin = mseteq darwin [ "x86_64-darwin" ];
2424 testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
2525 testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
2626 testillumos = mseteq illumos [ "x86_64-solaris" ];
27− testlinux = mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ];
27+ testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
2828 testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
2929 testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
3030 testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];