From f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 28 Sep 2010 08:37:27 +0000
Subject: xkeyboard-config pixman git update 28/9/2010

---
 xorg-server/xkeyboard-config/tests/xkbTestFunc.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'xorg-server/xkeyboard-config/tests/xkbTestFunc.pm')

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
-- 
cgit v1.2.3