Resolves: RHEL-1616 test9
This commit is contained in:
parent
58e6566453
commit
f9f518717c
@ -1,5 +1,5 @@
|
||||
--- ibus-1.5.19/src/tests/ibus-desktop-testing-runner.in.orig 2025-04-11 13:28:17.764620101 +0900
|
||||
+++ ibus-1.5.19/src/tests/ibus-desktop-testing-runner.in 2025-04-11 15:02:27.189118306 +0900
|
||||
+++ ibus-1.5.19/src/tests/ibus-desktop-testing-runner.in 2025-04-12 11:53:57.367461845 +0900
|
||||
@@ -43,6 +43,7 @@ SRCDIR="."
|
||||
TEST_LOG="test-suite.log"
|
||||
TEST_LOG_STDOUT=0
|
||||
@ -8,7 +8,14 @@
|
||||
HAVE_GRAPHICS=1
|
||||
DESKTOP_COMMAND="dbus-launch --exit-with-session gnome-session"
|
||||
PID_XORG=0
|
||||
@@ -94,8 +95,9 @@ usage()
|
||||
@@ -88,14 +89,16 @@ usage()
|
||||
"-T, --timeout=TIMEOUT Set timeout (default TIMEOUT is 300 sec).\n" \
|
||||
"-o, --output=OUTPUT_FILE OUtput the log to OUTPUT_FILE\n" \
|
||||
"-O, --result=RESULT_FILE OUtput the result to RESULT_FILE\n" \
|
||||
+"-S, --screendump=DUMP_FILE Output the screen to DUMP_FILE ('STDOUT' can be stdout)\n" \
|
||||
""
|
||||
}
|
||||
|
||||
parse_args()
|
||||
{
|
||||
# This is GNU getopt. "sudo port getopt" in BSD?
|
||||
@ -20,7 +27,7 @@
|
||||
-- "$@"`;
|
||||
eval set -- "$ARGS"
|
||||
while [ 1 ] ; do
|
||||
@@ -111,6 +113,7 @@ parse_args()
|
||||
@@ -111,6 +114,7 @@ parse_args()
|
||||
-T | --timeout ) TIMEOUT="$2"; shift 2;;
|
||||
-o | --output ) TEST_LOG="$2"; shift 2;;
|
||||
-O | --result ) RESULT_LOG="$2"; shift 2;;
|
||||
@ -28,13 +35,24 @@
|
||||
-- ) shift; break;;
|
||||
* ) usage; exit 1;;
|
||||
esac
|
||||
@@ -374,7 +377,12 @@ finit()
|
||||
@@ -214,7 +218,7 @@ run_desktop()
|
||||
sleep 1
|
||||
export DISPLAY=$DISPLAY
|
||||
echo "Running $DESKTOP_COMMAND with $USER in `tty`"
|
||||
- $DESKTOP_COMMAND &
|
||||
+ $DESKTOP_COMMAND 2>&1 &
|
||||
PID_GNOME_SESSION=$!
|
||||
sleep 30
|
||||
HAS_GNOME=`echo $DESKTOP_COMMAND | grep gnome-session`
|
||||
@@ -373,8 +377,13 @@ EOF_RUNNER
|
||||
finit()
|
||||
{
|
||||
echo "# Killing left gnome-session and Xorg"
|
||||
kill $PID_GNOME_SESSION $PID_XORG
|
||||
- kill $PID_GNOME_SESSION $PID_XORG
|
||||
- ibus exit
|
||||
+ kill $PID_GNOME_SESSION $PID_XORG >&/dev/null
|
||||
+ PID_IBUS=`pidof ibus-daemon`
|
||||
+ if x$PID_IBUS != x ; then
|
||||
+ if test x"$PID_IBUS" != x ; then
|
||||
+ ibus exit
|
||||
+ else
|
||||
+ echo "# Dead ibus-daemon"
|
||||
@ -42,7 +60,7 @@
|
||||
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
|
||||
@@ -386,14 +394,67 @@ finit()
|
||||
@@ -386,14 +395,67 @@ finit()
|
||||
echo "# Finished $PROGNAME testing"
|
||||
}
|
||||
|
||||
|
||||
@ -80,7 +80,6 @@
|
||||
--tests='{{ installed_test_name }}' \
|
||||
--output='{{ remote_artifacts }}/{{ installed_test_name }}.log' \
|
||||
--result='{{ remote_artifacts }}/test.log' \
|
||||
--screendump='STDOUT' \
|
||||
--timeout=900 \
|
||||
null
|
||||
if [ $? -eq 0 ]; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user