aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/tests
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-28 08:37:27 +0000
committermarha <marha@users.sourceforge.net>2010-09-28 08:37:27 +0000
commitf6ba83c963bf48dfa349ab8c54d1968c4c69f7b8 (patch)
treeb164bb78c8c755905fdbc272d8414162d2bf8090 /xorg-server/xkeyboard-config/tests
parent84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (diff)
downloadvcxsrv-f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8.tar.gz
vcxsrv-f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8.tar.bz2
vcxsrv-f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8.zip
xkeyboard-config pixman git update 28/9/2010
Diffstat (limited to 'xorg-server/xkeyboard-config/tests')
-rw-r--r--xorg-server/xkeyboard-config/tests/xkbTestFunc.pm15
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm b/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm
index 1d7881d23..77f03144f 100644
--- a/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm
+++ b/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm
@@ -38,13 +38,14 @@ sub getXkbSettings
sub setXkbSettings
{
my ( $xkbRules, $xkbModel, $xkbLayouts, $xkbVariants, $xkbOptions ) = @_;
- ( system ( "setxkbmap", "-synch",
- "-rules", $xkbRules,
- "-model", $xkbModel,
- "-layout", $xkbLayouts,
- "-variant", $xkbVariants,
- "-option", $xkbOptions ) == 0 ) or die "Could not set xkb configuration";
- sleep 1;
+ my $outfile = ".test.out.xkb";
+ ( system ( "setxkbmap -rules \"$xkbRules\" " .
+ "-model \"$xkbModel\" " .
+ "-layout \"$xkbLayouts\" " .
+ "-variant \"$xkbVariants\" " .
+ "-option \"$xkbOptions\" " .
+ "-print | xkbcomp - -xkb $outfile" ) == 0 ) or die "Could not set xkb configuration";
+ unlink($outfile);
}
sub restoreXkbSettings