Skip to content

Commit

Permalink
src/tests: Fix some tests
Browse files Browse the repository at this point in the history
- Delete ua(rstu) in org.freedesktop.ibus.gschema.xml
ua(rstu) has been available in xkeyboard-config 2.38 but deleted
in 2.39.

- Use command -v rather than which in runtest

Fixes: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/a9f7e47

BUG=#2542
BUG=#2544
  • Loading branch information
fujiwarat committed Aug 1, 2023
1 parent cac49dc commit d47dc55
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions data/dconf/org.freedesktop.ibus.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
'ru(xal)', 'se(rus)', 'se(rus_nodeadkeys)', 'se(swl)', 'sy',
'sy(syc)', 'sy(syc_phonetic)', 'th', 'th(pat)', 'th(tis)',
'tj', 'tj(legacy)', 'tz', 'ua', 'ua(homophonic)',
'ua(legacy)', 'ua(phonetic)', 'ua(rstu)', 'ua(rstu_ru)',
'ua(typewriter)', 'ua(winkeys)', 'us(chr)', 'us(rus)', 'uz' ]
'ua(legacy)', 'ua(phonetic)', 'ua(typewriter)', 'ua(winkeys)',
'us(chr)', 'us(rus)', 'uz' ]
</default>
<summary>Latin layouts which have no ASCII</summary>
<description>US layout is appended to the Latin layouts. variant can be omitted.</description>
Expand Down
3 changes: 1 addition & 2 deletions src/tests/runtest
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ MACHINE=`uname -m`
if test x"$MACHINE" = xx86_64 ; then
GTK_QUERY_MODULE=gtk-query-immodules-3.0-64
fi
which $GTK_QUERY_MODULE
if [ $? -ne 0 ] ; then
if ! command -v $GTK_QUERY_MODULE &> /dev/null ; then
GTK_QUERY_MODULE=gtk-query-immodules-3.0
fi

Expand Down

0 comments on commit d47dc55

Please sign in to comment.