public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Takao Fujiwara <tfujiwar@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ibus] autotool: Fix a wrong result in direct testing instead of GNOME desktop testing
Date: Sun, 31 May 2026 02:07:13 GMT [thread overview]
Message-ID: <178019323392.1.4305196964282966976.rpms-ibus-1a4e9d7c436f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ibus
Branch : autotool
Commit : 1a4e9d7c436f8bdde7558202198d3ee682b4960e
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date : 2019-07-31T16:34:43+09:00
Stats : +122/-4 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/ibus/c/1a4e9d7c436f8bdde7558202198d3ee682b4960e?branch=autotool
Log:
Fix a wrong result in direct testing instead of GNOME desktop testing
---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index b0ff887..837ffcc 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -15036,3 +15036,118 @@ index db359477..4b4c56e7 100644
--
2.21.0
+From 7dde99600777f195da614130950ecbd339439d35 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Wed, 31 Jul 2019 16:27:49 +0900
+Subject: [PATCH] src/tests: Fix wrong echo with direct runner in
+ ibus-desktop-testing-runner
+
+The wrong echo prevent from counting the test results in the direct
+testing runner.
+---
+ src/tests/ibus-desktop-testing-runner.in | 33 +++++++++++++-----------
+ 1 file changed, 18 insertions(+), 15 deletions(-)
+
+diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
+index b7a72285..3045d601 100755
+--- a/src/tests/ibus-desktop-testing-runner.in
++++ b/src/tests/ibus-desktop-testing-runner.in
+@@ -153,7 +153,7 @@ _EOF
+ XDG_LANG_ORIG=`cat $XDG_LOCALE_FILE`
+ XDG_LANG_NEW=`echo $LANG | sed -e 's/\(.*\)\..*/\1/'`
+ if [ "$XDG_LANG_ORIG" != "$XDG_LANG_NEW" ] ; then
+- echo "Overriding XDG locale $XDG_LANG_ORIG with $XDG_LANG_NEW"
++ echo "# Overriding XDG locale $XDG_LANG_ORIG with $XDG_LANG_NEW"
+ echo "$XDG_LANG_NEW" > $XDG_LOCALE_FILE
+ fi
+ fi
+@@ -206,11 +206,9 @@ echo_case_result()
+ subtst=${3:-''}
+
+ if test $retval -eq 0 ; then
+- print_log -e "${GREEN}PASS${NC}: $tst $subtst"
++ echo "PASS: $tst $subtst" >>$TEST_LOG
+ else
+- print_log -e "${RED}FAIL${NC}: $tst $subtst"
+- print_log "======================"
+- print_log ""
++ echo "FAIL: $tst $subtst" >>$TEST_LOG
+ fi
+ }
+
+@@ -232,32 +230,37 @@ EOF
+ echo_case_result $retval $tst
+ CACHE_FILES=`ls *.cache`
+ if [ x"$CACHE_FILES" != x ] ; then
+- print_log "Clean $CACHE_FILES"
++ echo "# Clean $CACHE_FILES" >>$TEST_LOG
+ rm $CACHE_FILES
+ fi
+ else
+- LANG_backup=$LANG
+ i=1
++ # Let for-loop notice '\n' as a delimiter
++ IFS=$'\n'
+ for e in $ENVS; do
++ # Revert IFS to recognize env a=foo b=foo
++ IFS=' '
+ first=`echo "$e" | grep '^#'`
+ if test x"$first" = x"#" ; then
+ continue
+ fi
+- export $e
+- $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
++ echo "# Starting $e $BUILDDIR/$tst $SRCDIR" >>$TEST_LOG
++ env $e $BUILDDIR/$tst $SRCDIR 2>>$TEST_LOG 1>>$TEST_LOG
+ retval=$?
++ echo "# Finished $e $BUILDDIR/$tst $SRCDIR with $retval" >>$TEST_LOG
+ read pass fail << EOF
+ `count_case_result $retval $pass $fail`
+ EOF
+ echo_case_result $retval $tst $e
+ CACHE_FILES=`ls *.cache`
+ if [ x"$CACHE_FILES" != x ] ; then
+- print_log "Clean $CACHE_FILES"
++ echo "# Clean $CACHE_FILES" >>$TEST_LOG
+ rm $CACHE_FILES
+ fi
+ i=`expr $i + 1`
++ IFS=$'\n'
+ done
+- export LANG=$LANG_backup
++ IFS=' '
+ fi
+ done
+ echo $pass $fail
+@@ -325,24 +328,24 @@ EOF_RUNNER
+ if [ $TEST_LOG_STDOUT -eq 1 ] ; then
+ cat $TEST_LOG
+ else
+- echo "See $TEST_LOG"
++ echo "# See $TEST_LOG"
+ fi
+ }
+
+ finit()
+ {
+- echo "Killing left gnome-session and Xorg"
++ echo "# Killing left gnome-session and Xorg"
+ kill $PID_GNOME_SESSION $PID_XORG
+ ibus exit
+ SUSER=`echo "$USER" | cut -c 1-7`
+ LEFT_CALENDAR=`ps -ef | grep gnome-shell-calendar-server | grep $SUSER | grep -v grep`
+ if [ x"$LEFT_CALENDAR" != x ] ; then
+- echo "Killing left gnome-shell-calendar-server"
++ echo "# Killing left gnome-shell-calendar-server"
+ echo "$LEFT_CALENDAR"
+ echo "$LEFT_CALENDAR" | awk '{print $2}' | xargs kill
+ fi
+
+- echo "Finished $PROGNAME testing"
++ echo "# Finished $PROGNAME testing"
+ }
+
+ main()
+--
+2.21.0
+
diff --git a/ibus.spec b/ibus.spec
index a11bc52..5a22786 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -35,7 +35,7 @@
Name: ibus
Version: 1.5.20
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
URL: https://github.com/ibus/%name/wiki
@@ -464,6 +464,9 @@ dconf update || :
%{_datadir}/installed-tests/ibus
%changelog
+* Wed Jul 31 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.20-8
+- Fix a wrong result in direct testing instead of GNOME desktop testing
+
* Mon Jul 29 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.20-7
- Add CI
diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index b1666d5..cd7cf72 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -8,7 +8,7 @@
- name: Build and install GNOME installed-tests testing harness
when: gnome_desktop_testing_runner.matched == 0
block:
- - name: Installing build dependencies for GNOME installed-tests testing harness
+ - name: Installing build dependencies for IBus and GNOME installed-tests testing harness
package:
name:
- git
@@ -53,9 +53,9 @@
args:
chdir: gnome-desktop-testing
-- name: Start GNOME installed-tests testing harness
+- name: Start IBus installed-tests testing harness
block:
- - name: Execute tests
+ - name: Execute IBus tests
shell: |
set -e
status="FAIL: frame"
reply other threads:[~2026-05-31 2:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178019323392.1.4305196964282966976.rpms-ibus-1a4e9d7c436f@fedoraproject.org \
--to=tfujiwar@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox