···

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  testReader = pkgs.writeScript "test-input-reader" ''

     

       
10
       
10
       
 
       
    #!${pkgs.stdenv.shell}

     

       
11
       
11
       
-
       
    rm -f ${resultFile}

     

       
11
       
11
       
+
       
    rm -f ${resultFile} ${resultFile}.tmp

     

       
12
       
12
       
 
       
    logger "testReader: START: Waiting for $1 characters, expecting '$2'."

     

       
13
       
13
       
 
       
    touch ${readyFile}

     

       
14
       
14
       
 
       
    read -r -N $1 chars

     

       
15
       
15
       
 
       
    rm -f ${readyFile}

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
    if [ "$chars" == "$2" ]; then

     

       
18
       
18
       
-
       
      logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}

     

       
18
       
18
       
+
       
      logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp

     

       
19
       
19
       
 
       
    else

     

       
20
       
20
       
-
       
      logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}

     

       
20
       
20
       
+
       
      logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp

     

       
21
       
21
       
 
       
    fi

     

       
22
       
22
       
+
       
    # rename after the file is written to prevent a race condition

     

       
23
       
23
       
+
       
    mv  ${resultFile}.tmp ${resultFile}

     

       
22
       
24
       
 
       
  '';

     

       
23
       
25
       
 
       


     

       
24
       
26
       
 
       


     
···

       
52
       
54
       
 
       
          if ($desc eq "Xorg keymap") {

     

       
53
       
55
       
 
       
            # make sure the xterm window is open and has focus

     

       
54
       
56
       
 
       
            $machine->waitForWindow(qr/testterm/);

     

       
55
       
55
       
-
       
            $machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync");

     

       
57
       
57
       
+
       
            $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync");

     

       
56
       
58
       
 
       
          }

     

       
57
       
59
       
 
       


     

       
58
       
60
       
 
       
          # wait for reader to be ready

     
···

       
71
       
73
       
 
       
      $machine->waitForX;

     

       
72
       
74
       
 
       


     

       
73
       
75
       
 
       
      mkTest "VT keymap", "openvt -sw --";

     

       
74
       
74
       
-
       
      mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e";

     

       
76
       
76
       
+
       
      mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e";

     

       
75
       
77
       
 
       
    '';

     

       
76
       
78
       
 
       
  };

     

       
77
       
79