From 472fb49a9644facd34ec2102d4e0375a88fde8ea Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Mon, 27 Sep 2010 23:05:54 +0100
Subject: faster testing - no involvement of X, just xkbcomp

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

(limited to 'tests')

diff --git a/tests/xkbTestFunc.pm b/tests/xkbTestFunc.pm
index 8d51121..0ec3ada 100755
--- a/tests/xkbTestFunc.pm
+++ b/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.1