Accepting request 652287 from home:Andreas_Schwab:Factory
- Update to dejagnu 1.6.2
* runtest will abort if $DEJAGNU is defined but the file is not
found.
- close-wait-program.patch: Removed
OBS-URL: https://build.opensuse.org/request/show/652287
OBS-URL: https://build.opensuse.org/package/show/devel:tools/dejagnu?expand=0&rev=30
This commit is contained in:
Andreas Schwab
Git OBS Bridge
parent
9fac9c2539
commit
cb8a9a0612
@ -1,49 +0,0 @@
|
||||
2018-07-06 Richard Biener <rguenther@suse.de>
|
||||
|
||||
* lib/remote.exp (close_wait_program): Use separate kill command
|
||||
for each pid.
|
||||
|
||||
Index: dejagnu-1.6.1/lib/remote.exp
|
||||
===================================================================
|
||||
--- dejagnu-1.6.1.orig/lib/remote.exp
|
||||
+++ dejagnu-1.6.1/lib/remote.exp
|
||||
@@ -70,13 +70,16 @@ proc close_wait_program { program_id pid
|
||||
# Tcl has no kill primitive, so we have to execute an external
|
||||
# command in order to kill the process.
|
||||
verbose "doing kill, pid is $pid"
|
||||
- # Prepend "-" to generate the "process group ID" needed by
|
||||
- # kill.
|
||||
- set pgid "-$pid"
|
||||
# Send SIGINT to give the program a better chance to interrupt
|
||||
# whatever it might be doing and react to stdin closing.
|
||||
# eg, in case of GDB, this should get it back to the prompt.
|
||||
- exec sh -c "exec > /dev/null 2>&1 && (kill -2 $pgid || kill -2 $pid)"
|
||||
+ # Do so separately for each PID in the list to avoid differences
|
||||
+ # in return value behavior for kill between shells
|
||||
+ foreach spid $pid {
|
||||
+ # Prepend "-" to generate the "process group ID" needed by
|
||||
+ # kill.
|
||||
+ exec sh -c "exec > /dev/null 2>&1 && (kill -2 -$spid || kill -2 $spid)"
|
||||
+ }
|
||||
|
||||
# If the program doesn't exit gracefully when stdin closes,
|
||||
# we'll need to kill it. But only do this after 'wait'ing a
|
||||
@@ -86,9 +89,15 @@ proc close_wait_program { program_id pid
|
||||
# PID reuse race.
|
||||
set secs 5
|
||||
set sh_cmd "exec > /dev/null 2>&1"
|
||||
- append sh_cmd " && sleep $secs && (kill -15 $pgid || kill -15 $pid)"
|
||||
- append sh_cmd " && sleep $secs && (kill -9 $pgid || kill -9 $pid)"
|
||||
- append sh_cmd " && sleep $secs"
|
||||
+ append sh_cmd " && sleep $secs && ("
|
||||
+ foreach spid $pid {
|
||||
+ append sh_cmd "(kill -15 -$spid || kill -15 $spid);"
|
||||
+ }
|
||||
+ append sh_cmd ") && sleep $secs && ("
|
||||
+ foreach spid $pid {
|
||||
+ append sh_cmd "(kill -9 -$spid || kill -9 $spid);"
|
||||
+ }
|
||||
+ append sh_cmd ") && sleep $secs"
|
||||
set exec_pid [exec sh -c "$sh_cmd" &]
|
||||
}
|
||||
verbose "pid is $pid"
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf5b28bb797e0ace4cfc0766a996339c795d8223bef54158be7887046bc01692
|
||||
size 526012
|
||||
Binary file not shown.
3
dejagnu-1.6.2.tar.gz
Normal file
3
dejagnu-1.6.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261
|
||||
size 525879
|
||||
16
dejagnu-1.6.2.tar.gz.sig
Normal file
16
dejagnu-1.6.2.tar.gz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEFS8+rdM1/2KWERKFZ9rcPj90NkkFAlv+LbYACgkQZ9rcPj90
|
||||
NkkN1A/+MaSvPMQLOkusv1f5LA2fSZBJpYUrEpHBhm9GnmbeNcvoHnXu9BsdUAPh
|
||||
zMrbvNqelrwONFFdOcOZA4CtK0pps78DSPW7JSaPX45E1tT82YGsgpikrGvU4AbM
|
||||
FUl0PjddAUajQ/0oY3FUlLXMTZAOT2AGMK2si5OmTtP/azZNHoEryB+IenEVYTCD
|
||||
ggNUrY/Vq6BwzuNBgOqBT/88Kd2yW40IPyfcebRA2vJxU9WsZ5sXMZGbMStz0lfe
|
||||
g0sMCfnmCSLrRROrzXin2lc5MYtcYYW/W43Wa1O/QphalNNUP51LP6wxiO7m1mUN
|
||||
6I9WnKy0VKqKjo4BipMKCgQJNfnKVnPuEjRpTet57wl6SHcacMiitNcJJgD/k48f
|
||||
KUvVn4UFjKrHCnYeEKdPpfvcFXR50+Z0VDyWjzs40E+DT60tYOh9Z1Y5fqT4r/s0
|
||||
u8H3BBzRV/JMP/eRsQbolGHjw4AxoMb9uPobx8aCGzlv6rrvYb9ePbst+hVHk16A
|
||||
jjFiMDFaLmWyStpTezs5I6+doaknbYTHrf/qrCwAoxsRpVhzCdIzRJtwf+SUIWf8
|
||||
k1K+rW2aP7PeNPxTnZ5ZdkbZTwn/1oG8iiFbCxAsL2g3/mVDxY47RAinc/qP7CLE
|
||||
rG0+NzteCXHPnRCYSK+h1V9iAjeDAim7mB4GMcbL1Tvf9uudgL0=
|
||||
=WgBv
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 28 08:58:00 UTC 2018 - schwab@suse.de
|
||||
|
||||
- Update to dejagnu 1.6.2
|
||||
* runtest will abort if $DEJAGNU is defined but the file is not
|
||||
found.
|
||||
- close-wait-program.patch: Removed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 31 09:55:04 UTC 2018 - schwab@suse.de
|
||||
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: dejagnu
|
||||
Version: 1.6.1
|
||||
Version: 1.6.2
|
||||
Release: 0
|
||||
Summary: Framework for Running Test Suites on Software Tools
|
||||
License: GPL-3.0-or-later
|
||||
@ -27,7 +27,6 @@ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
|
||||
Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
|
||||
Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=dejagnu&download=1#/%{name}.keyring
|
||||
Source3: site.exp
|
||||
Patch0: close-wait-program.patch
|
||||
BuildRequires: expect
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -66,7 +65,6 @@ suites themselves.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
||||
Loading…
Reference in New Issue
Block a user