summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2021-06-29 12:40:20 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2021-06-29 12:40:20 +0900
commitab6b9587a497e9662a2936df3dabed4582eeabdb (patch)
treede44a72f82ade89f0681e87fd580fc8c57e1293e
parent7f09379b3cb69c7de6d8d667ce398dcfc0000433 (diff)
downloadibus-ab6b9587a497e9662a2936df3dabed4582eeabdb.tar.gz
src/tests: Delete G_MESSAGES_DEBUG in desktop-testing for gsettings
G_MESSAGES_DEBUG message could be appended to the output of gsettings command and it's not useful to check the output.
-rwxr-xr-xsrc/tests/ibus-desktop-testing-runner.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
index 54b7e0d7..0ef72c03 100755
--- a/src/tests/ibus-desktop-testing-runner.in
+++ b/src/tests/ibus-desktop-testing-runner.in
@@ -217,6 +217,10 @@ init_gnome()
{
# gsettings set command needs dconf-service with the same $DISPLAY
pkill dconf-service
+ # G_MESSAGES_DEBUG=all or G_MESSAGES_DEBUG=GLib-GIO-DEBUG would append
+ # debug messages to gsettings output and could not get the result correctly.
+ backup_G_MESSAGES_DEBUG="$G_MESSAGES_DEBUG"
+ export -n G_MESSAGES_DEBUG=''
# Disable Tour dialog to get focus
V=`gsettings get org.gnome.shell welcome-dialog-last-shown-version`
if [ x"$V" = x"''" ] ; then
@@ -238,14 +242,17 @@ init_gnome()
echo "$V" | grep "no-overview" > /dev/null
V2=$?
if [ $V2 -ne 0 ] ; then
- V3=`echo "$V" | sed -e 's/\[//' -e 's/\]//'`
- if [ x"$V3" = x"''" ] ; then
+ V3=`echo "$V" | sed -e 's/@as //' -e 's/\[//' -e 's/\]//'`
+ if [ x"$V3" = x"''" ] || [ x"$V3" = x"" ]; then
V4="['no-overview@fthx']"
else
V4="[$V3, 'no-overview@fthx']"
fi
gsettings set org.gnome.shell enabled-extensions "$V4"
fi
+ if [ x"$backup_G_MESSAGES_DEBUG" != x ] ; then
+ export G_MESSAGES_DEBUG="$backup_G_MESSAGES_DEBUG"
+ fi
}
run_desktop()