commit 9071cb3001c1b003d4e4f12e1ea438bfa1301b46 · pyrox.dev/nixpkgs

+4 -5

nixos/tests/cage.nix

···

       18
       18
        
           };

     

       19
       19
        
       

     

       20
       20
        
           virtualisation.memorySize = 1024;

     

       21
       21
       +
           # Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std):

     

       22
       22
       +
           # machine # [   14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000]

     

       23
       23
       +
           # machine # [   14.358108] Code: 4f a8 ff ff eb aa 0f 1f 44 00 00 c3 0f 1f 80 00 00 00 00 41 54 49 89 f4 55 31 ed 53 48 89 fb 48 8d 7f 18 48 8d 83 b8 00 00 00 <80> 7f 08 00 75 0d 48 83 3f 00 0f 85 91 00 00 00 48 89 fd 48 83 c7

     

       24
       24
       +
           virtualisation.qemu.options = [ "-vga virtio" ];

     

       21
       25
        
         };

     

       22
       26
        
       

     

       23
       27
        
         enableOCR = true;

     
···

       25
       29
        
         testScript = { nodes, ... }: let

     

       26
       30
        
           user = nodes.machine.config.users.users.alice;

     

       27
       31
        
         in ''

     

       28
       28
       -
           # Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std):

     

       29
       29
       -
           # machine # [   14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000]

     

       30
       30
       -
           # machine # [   14.358108] Code: 4f a8 ff ff eb aa 0f 1f 44 00 00 c3 0f 1f 80 00 00 00 00 41 54 49 89 f4 55 31 ed 53 48 89 fb 48 8d 7f 18 48 8d 83 b8 00 00 00 <80> 7f 08 00 75 0d 48 83 3f 00 0f 85 91 00 00 00 48 89 fd 48 83 c7

     

       31
       31
       -
           os.environ["QEMU_OPTS"] = "-vga virtio"

     

       32
       32
       -
       

     

       33
       32
        
           with subtest("Wait for cage to boot up"):

     

       34
       33
        
               start_all()

     

       35
       34
        
               machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")

+3 -5

nixos/tests/os-prober.nix

···

       69
       69
        
             imports = [ ../modules/profiles/installation-device.nix

     

       70
       70
        
                         ../modules/profiles/base.nix ];

     

       71
       71
        
             virtualisation.memorySize = 1300;

     

       72
       72
       +
             # To add the secondary disk:

     

       73
       73
       +
             virtualisation.qemu.options = [ "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio" ];

     

       74
       74
       +
       

     

       72
       75
        
             # The test cannot access the network, so any packages

     

       73
       76
        
             # nixos-rebuild needs must be included in the VM.

     

       74
       77
        
             system.extraDependencies = with pkgs;

     
···

       95
       98
        
         });

     

       96
       99
        
       

     

       97
       100
        
         testScript = ''

     

       98
       98
       -
           # hack to add the secondary disk

     

       99
       99
       -
           os.environ[

     

       100
       100
       -
               "QEMU_OPTS"

     

       101
       101
       -
           ] = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio"

     

       102
       102
       -
       

     

       103
       101
        
           machine.start()

     

       104
       102
        
           machine.succeed("udevadm settle")

     

       105
       103
        
           machine.wait_for_unit("multi-user.target")