cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #156200 from B4dM4n/nixos-tests-wine

Browse source
This commit is contained in:
Artturi 2022-03-20 17:37:38 +02:00 committed by GitHub
commit 8cfcf8c9a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nixos/tests/wine.nix
View file

@ -3,7 +3,7 @@
}: }:
let let
inherit (pkgs.lib) concatMapStrings listToAttrs; inherit (pkgs.lib) concatMapStrings listToAttrs optionals optionalString;
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe"; hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe";
@ -27,6 +27,9 @@ let
"bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'"
) )
assert 'Hello, world!' in greeting assert 'Hello, world!' in greeting
''
# only the full version contains Gecko, but the error is not printed reliably in other variants
+ optionalString (variant == "full") ''
machine.fail( machine.fail(
"fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr"
) )
@ -37,5 +40,9 @@ let
variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ]; variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ];
in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants in
++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) listToAttrs (
map (makeWineTest "winePackages" [ hello32 ]) variants
++ optionals pkgs.stdenv.is64bit
(map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants)
)