diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/listCI2.xsl | 11 | ||||
-rw-r--r-- | tests/listCIs.xsl | 13 | ||||
-rwxr-xr-x | tests/testLayouts.pl | 4 | ||||
-rw-r--r-- | tests/testModels.pl | 6 | ||||
-rwxr-xr-x | tests/testOptions.pl | 4 |
5 files changed, 27 insertions, 11 deletions
diff --git a/tests/listCI2.xsl b/tests/listCI2.xsl index 3dd48d70..484d9dd8 100644 --- a/tests/listCI2.xsl +++ b/tests/listCI2.xsl @@ -7,10 +7,15 @@ <xsl:param name="type"/> <xsl:param name="parentId"/> + <xsl:template match="xkbConfigRegistry"> + <xsl:apply-templates select=".//configItem[(name(..) = $type) and (../../../configItem/name = $parentId or ../../configItem/name = $parentId )]"> + <xsl:sort select="name"/> + </xsl:apply-templates> + </xsl:template> + <xsl:template match="configItem"> - <xsl:if test="name(..) = $type and ( ../../../configItem/name = $parentId or ../../configItem/name = $parentId )"> - <xsl:value-of select="./name"/> - </xsl:if> + <xsl:value-of select="./name"/><xsl:text> +</xsl:text> </xsl:template> </xsl:stylesheet> diff --git a/tests/listCIs.xsl b/tests/listCIs.xsl index 0d2cd979..09cf4d92 100644 --- a/tests/listCIs.xsl +++ b/tests/listCIs.xsl @@ -5,11 +5,16 @@ <xsl:output method="text"/> <xsl:param name="type"/> - + + <xsl:template match="xkbConfigRegistry"> + <xsl:apply-templates select=".//configItem[name(..) = $type]"> + <xsl:sort select="name"/> + </xsl:apply-templates> + </xsl:template> + <xsl:template match="configItem"> - <xsl:if test="name(..) = $type"> - <xsl:value-of select="./name"/> - </xsl:if> + <xsl:value-of select="./name"/><xsl:text> +</xsl:text> </xsl:template> </xsl:stylesheet> diff --git a/tests/testLayouts.pl b/tests/testLayouts.pl index 38ccb3a2..8013db42 100755 --- a/tests/testLayouts.pl +++ b/tests/testLayouts.pl @@ -5,7 +5,7 @@ use warnings; use xkbTestFunc; xkbTestFunc::backupXkbSettings(); - + xkbTestFunc::dumpXkbSettingsBackup(); xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1, 0 ); @@ -13,3 +13,5 @@ xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")", 1, 1, 0 ); sleep 2; xkbTestFunc::restoreXkbSettings(); + +print "Done!\n"; diff --git a/tests/testModels.pl b/tests/testModels.pl index c66a4499..a7a51c1d 100644 --- a/tests/testModels.pl +++ b/tests/testModels.pl @@ -5,9 +5,11 @@ use warnings; use xkbTestFunc; xkbTestFunc::backupXkbSettings(); - + xkbTestFunc::dumpXkbSettingsBackup(); - + xkbTestFunc::testLevel1( "model", 1 ); xkbTestFunc::restoreXkbSettings(); + +print "Done!\n"; diff --git a/tests/testOptions.pl b/tests/testOptions.pl index a4853256..8a0cb0f4 100755 --- a/tests/testOptions.pl +++ b/tests/testOptions.pl @@ -5,9 +5,11 @@ use warnings; use xkbTestFunc; xkbTestFunc::backupXkbSettings(); - + xkbTestFunc::dumpXkbSettingsBackup(); xkbTestFunc::testLevel2( "group", "option", 4, ":", "", 0, 0, 1 ); xkbTestFunc::restoreXkbSettings(); + +print "Done!\n"; |