From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] dejagnu: Update to 1.6
Date: Fri, 20 May 2016 10:55:39 +0100
Message-ID: <1463738139.19435.34.camel@ipfire.org>
In-Reply-To: <1463722798-1813-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6301925958548310281=="
List-Id: <development.lists.ipfire.org>

--===============6301925958548310281==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

I assume you already knew what I was going to comment on the first version :)

On Fri, 2016-05-20 at 07:39 +0200, Alexander Marx wrote:
> Fixes: #11101
>=20
> Important changes include decent SSH support, many bug fixes and a
> much improved manual. Many old and defunct board files have been
> removed. Refer to the NEWS file for full details.
>=20
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
> =C2=A0dejagnu/dejagnu.nm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 16 ++--
> =C2=A0dejagnu/patches/dejagnu-1.4.4-runtest.patch=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0| 12 ---
> =C2=A0dejagnu/patches/dejagnu-1.4.4-smp-1.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0| 26 -------
> =C2=A0dejagnu/patches/dejagnu-1.4.4-testsuite.patch=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0| 93 ----------------------
> -
> =C2=A0dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch | 20 -----
> =C2=A05 files changed, 5 insertions(+), 162 deletions(-)
> =C2=A0delete mode 100644 dejagnu/patches/dejagnu-1.4.4-runtest.patch
> =C2=A0delete mode 100644 dejagnu/patches/dejagnu-1.4.4-smp-1.patch
> =C2=A0delete mode 100644 dejagnu/patches/dejagnu-1.4.4-testsuite.patch
> =C2=A0delete mode 100644 dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
>=20
> diff --git a/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm
> index c0f8fe4..d6e0a6e 100644
> --- a/dejagnu/dejagnu.nm
> +++ b/dejagnu/dejagnu.nm
> @@ -4,8 +4,8 @@
> =C2=A0#####################################################################=
########
> ##
> =C2=A0
> =C2=A0name=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D dejagnu
> -version=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.4.4
> -release=C2=A0=C2=A0=C2=A0=C2=A0=3D 2
> +version=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.6
> +release=C2=A0=C2=A0=C2=A0=C2=A0=3D 1
> =C2=A0arch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D noarch
> =C2=A0
> =C2=A0groups=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D Development/Tools
> @@ -17,24 +17,18 @@ description
> =C2=A0	DejaGnu is an Expect/Tcl based framework for testing other programs.
> =C2=A0end
> =C2=A0
> -source_dl=C2=A0=C2=A0=3D
> +source_dl=C2=A0=C2=A0=3D http://mirror.netcologne.de/gnu/dejagnu/
> +sources=C2=A0=C2=A0=C2=A0=C2=A0=3D %{thisapp}.tar.gz
> =C2=A0
> =C2=A0build
> =C2=A0	requires
> =C2=A0		bison
> +		expect
> =C2=A0	end
> =C2=A0
> =C2=A0	configure_options +=3D \
> =C2=A0		--mandir=3D/usr/share/man
> =C2=A0
> -	# Disabled because testsuite doesn't wort at the moment.
> -	#define test
> -	#	make check
> -	#endef
> -
> -	install_cmds
> -		make -C doc DESTDIR=3D%{BUILDROOT} install-man
> -	end
> =C2=A0end
> =C2=A0
> =C2=A0packages
> diff --git a/dejagnu/patches/dejagnu-1.4.4-runtest.patch
> b/dejagnu/patches/dejagnu-1.4.4-runtest.patch
> deleted file mode 100644
> index 2d75f4c..0000000
> --- a/dejagnu/patches/dejagnu-1.4.4-runtest.patch
> +++ /dev/null
> @@ -1,12 +0,0 @@
> ---- dejagnu-1.4.4/runtest.exp.old	2003-10-15 15:22:52.000000000 +0200
> -+++ dejagnu-1.4.4/runtest.exp	2008-08-27 16:22:18.000000000 +0200
> -@@ -1443,8 +1443,7 @@
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0global tool
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0clone_output "Running $test_file_name ..."
> --=C2=A0=C2=A0=C2=A0=C2=A0set prms_id	0
> --=C2=A0=C2=A0=C2=A0=C2=A0set bug_id	0
> -+=C2=A0=C2=A0=C2=A0=C2=A0reset_vars
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0set test_result ""
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if [file exists $test_file_name] {
> diff --git a/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
> b/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
> deleted file mode 100644
> index 0a30f45..0000000
> --- a/dejagnu/patches/dejagnu-1.4.4-smp-1.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> ---- dejagnu-1.4.4/lib/remote.exp.smp	2003-10-10 23:42:46.000000000
> -0700
> -+++ dejagnu-1.4.4/lib/remote.exp	2005-08-05 12:32:10.107161990 -0700
> -@@ -91,9 +91,13 @@ proc local_exec { commandline inp outp t
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# programs that bear children. We can't use =
tcl's exec because it has
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# no way to timeout programs that hang. *sig=
h*
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0#
> -+=C2=A0=C2=A0=C2=A0=C2=A0# The expect command will close the connection wh=
en it sees EOF. On
> -+=C2=A0=C2=A0=C2=A0=C2=A0# SMP machine, close the connection may send SIGH=
UP to the child
> -+=C2=A0=C2=A0=C2=A0=C2=A0# and cause it to exit before it can exit normall=
y.=C2=A0=C2=A0We should make
> -+=C2=A0=C2=A0=C2=A0=C2=A0# the child to ignore SIGHUP.
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if { "$inp" =3D=3D "" && "$outp" =3D=3D "" }=
 {
> -=C2=A0	set id -1
> --	set result [catch "eval spawn \{${commandline}\}" pid]
> -+	set result [catch "eval spawn -ignore SIGHUP \{${commandline}\}"
> pid]
> -=C2=A0	if { $result =3D=3D 0 } {
> -=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0set result2 0
> -=C2=A0	} else {
> -@@ -134,7 +138,7 @@ proc local_exec { commandline inp outp t
> -=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0return [list -1 "open of $commandline $inp =
$outp failed:
> $errorInfo"]
> -=C2=A0	}
> -=C2=A0	set pid [pid $id]
> --	set result [catch "spawn -leaveopen $id" result2]
> -+	set result [catch "spawn -ignore SIGHUP -leaveopen $id" result2]
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# Prepend "-" to each pid, to generate the "=
process group IDs" needed by
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# kill.
> diff --git a/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
> b/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
> deleted file mode 100644
> index d9e07ea..0000000
> --- a/dejagnu/patches/dejagnu-1.4.4-testsuite.patch
> +++ /dev/null
> @@ -1,93 +0,0 @@
> -diff -Burp dejagnu-1.4.4/testsuite/libdejagnu/unit.cc dejagnu-1.4.4-
> pm/testsuite/libdejagnu/unit.cc
> ---- dejagnu-1.4.4/testsuite/libdejagnu/unit.cc	2003-08-17
> 03:33:06.000000000 +0200
> -+++ dejagnu-1.4.4-pm/testsuite/libdejagnu/unit.cc	2007-10-03
> 18:31:03.000000000 +0200
> -@@ -7,6 +7,7 @@
> - #include <fstream>
> - #include <set>
> - #include <dejagnu.h>
> -+#include <sstream>
> -=C2=A0
> - using namespace std;
> -=C2=A0
> -@@ -49,12 +50,8 @@ main (int argc, char *argv[]) {
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// Replace the output buffer for cout, so we=
 can examine it to
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// see what was displayed. Otherwise, there =
is no way we can test
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// the logging functions completely.
> --=C2=A0=C2=A0=C2=A0=C2=A0char bbuuff[5120];
> --#ifdef __STDC_HOSTED__
> --=C2=A0=C2=A0=C2=A0=C2=A0cout.rdbuf()->pubsetbuf(bbuuff, 5120);
> --#else
> --=C2=A0=C2=A0=C2=A0=C2=A0cout.rdbuf()->setbuf(bbuuff, 5120);
> --#endif
> -+=C2=A0=C2=A0=C2=A0=C2=A0stringstream stream;
> -+=C2=A0=C2=A0=C2=A0=C2=A0streambuf * buf =3D cout.rdbuf(stream.rdbuf());
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0testClass1.tname =3D "testType1";
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0testClass1.tnum =3D 1;
> -@@ -65,53 +62,59 @@ main (int argc, char *argv[]) {
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// Test the pass message
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0test.pass ("bogus pass message for testing");
> -+=C2=A0=C2=A0=C2=A0=C2=A0cout.flush();
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os2;
> --=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(bbuuff, "\tPAS: bogus pass message", =
22) =3D=3D 0) {
> -+=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(stream.str().c_str(), "\tPAS: bogus p=
ass message", 22) =3D=3D 0)
> {
> -=C2=A0	runtest.pass ("Pass message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
> -=C2=A0	runtest.fail ("Pass message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> -+=C2=A0=C2=A0=C2=A0=C2=A0stream.str("");
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// Test the fail message
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os1;
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0test.fail ("bogus fail message for testing");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cout.flush();
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os2;
> --=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(bbuuff, "\tFAI: bogus fail message", =
22) =3D=3D 0) {
> -+=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(stream.str().c_str(), "\tFAI: bogus f=
ail message", 22) =3D=3D 0)
> {
> -=C2=A0	runtest.pass ("Fail message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
> -=C2=A0	runtest.fail ("Fail message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> -+=C2=A0=C2=A0=C2=A0=C2=A0stream.str("");
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// Test the untested message
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os1;
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0test.untested ("bogus untested message for t=
esting");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cout.flush();
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os2;
> --=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(bbuuff, "\tUNT: bogus untested messag=
e", 21) =3D=3D 0) {
> -+=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(stream.str().c_str(), "\tUNT: bogus u=
ntested message", 21)
> =3D=3D 0) {
> -=C2=A0	runtest.pass ("Untested message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
> -=C2=A0	runtest.fail ("Untested message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> -+=C2=A0=C2=A0=C2=A0=C2=A0stream.str("");
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// Test the unresolved message
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os1;
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0test.unresolved ("bogus unresolved message f=
or testing");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cout.flush();
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0outstate =3D os2;
> --=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(bbuuff, "\tUNR: bogus unresolved mess=
age", 21) =3D=3D 0) {
> -+=C2=A0=C2=A0=C2=A0=C2=A0if (strncmp(stream.str().c_str(), "\tUNR: bogus u=
nresolved message", 21)
> =3D=3D 0) {
> -=C2=A0	runtest.pass ("Unresolved message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
> -=C2=A0	runtest.fail ("Unresolved message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> -+=C2=A0=C2=A0=C2=A0=C2=A0stream.str("");
> -=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// Make sure we got everything in the totals
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0regcomp (&regex_pat, "\r\n\t#passed.*#failed=
.*#untested.*#unresolved",
> REG_NOSUB|REG_NEWLINE);
> --=C2=A0=C2=A0=C2=A0=C2=A0if (regexec (&regex_pat, bbuuff, 0, (regmatch_t *=
)0, 0)) {
> -+=C2=A0=C2=A0=C2=A0=C2=A0if (regexec (&regex_pat, stream.str().c_str(), 0,=
 (regmatch_t *)0, 0)) {
> -=C2=A0	runtest.pass ("Totals message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} else {
> -=C2=A0	runtest.fail ("Totals message");
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0}
> --}
> --
> -+=C2=A0=C2=A0=C2=A0=C2=A0stream.str("");
> -=C2=A0
> -+=C2=A0=C2=A0=C2=A0=C2=A0cout.rdbuf(buf);
> -+}
> diff --git a/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
> b/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
> deleted file mode 100644
> index 2823d5d..0000000
> --- a/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> ---- dejagnu-1.4.4/lib/utils.exp	2009-10-16 12:58:38.000000000 +0200
> -+++ dejagnu-1.4.4/lib/utils.exp	2010-01-21 21:12:54.144855458 +0100
> -@@ -106,7 +106,7 @@ proc find { rootdir pattern } {
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0foreach i $dirs {
> -=C2=A0	verbose "Looking in $i" 3
> -=C2=A0	foreach match [glob -nocomplain $i/$pattern] {
> --	=C2=A0=C2=A0=C2=A0=C2=A0if ![file isdirectory $match] {
> -+	=C2=A0=C2=A0=C2=A0=C2=A0if {![file isdirectory $match]} {
> -=C2=A0		lappend files $match
> -=C2=A0		verbose "Adding $match to file list" 3
> -=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0}
> -@@ -216,7 +216,7 @@ proc prune { list pattern } {
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0set tmp {}
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0foreach i $list {
> -=C2=A0	verbose "Checking pattern \"$pattern\" against $i" 3
> --	if ![string match $pattern $i] {
> -+	if {![string match $pattern $i]} {
> -=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0lappend tmp $i
> -=C2=A0	} else {
> -=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0verbose "Removing element $i from list" 3

--===============6301925958548310281==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlhQdDhiQUFvSkVJQjU4UDl2a0FrSFpKc1AvMzFQK2J3dEtYMVI2cG9RRUFKMUlDWXUK
UWY0emJ0VmtVS3BKbmtBUnFtVm4vTjVsZDVlRzkrSWhpQ2x1NnJicFF6anNUVnRoVkt2NDdiTXpU
eFM1cmtLZgp0U0FXREVQR0NaUkVkVjhnYksvbERway9scFRFZUlKdFpQVEM0U0ZOMzFsbHRMWXpW
Nkx3UXNNMjlMOTM2ZVB2CnNTTWNJZURpZnFzbkR0eXNKSU1SQkpLVUpwOCtydEZnekJES0d1UFBP
UmRlU2R5UFZlcVZ5R3RXTG9oaVQ4NVQKUlBMVzV4QkZWNlMwRzY3WGNkeVNldzAzWUU5VTV3R2l4
NFFFTW42WDVvU2d3cnowb0UwMVRvR2RINDQrbWJ6ZwpaK1hJL0VFcU9MZjNiVXhPYkEwQnBRd1F6
eUQ0VTNOT2o0N3BQbDlCeG9pc1FVaDZJa0Z1QVZrMkdoVTQzYWlrClpmL3BCL3JlNXh4TkxMV05S
NGMzWGVyUXdxTnFNZ0lGeXNDWUEveFFCYjY4TWpyZm9tcUViNTBhTXFhRHkwRDcKYXRoOG5tMkZT
cFFBUUJSVUo5c2Nac01FTFJhUDArcVRseUJRTEF4c0hXem1ncGpCNWx1TmVUcDF5eEt3ZGRZeQpw
US9EQUhjZmJUSFhpQ25uQi9lVDk2c3VWRlBJYmcyOU9mSDBYcnVONmp0aHpsRnMreWozc1IxeWM2
cFo1N1NrCjYrTFBDL0pHOUt4N2lJWjNENkdlRlhCRkRwV0JRRklVbDZxWTNuOHNPcjVlQTMzZXZN
c1NqVnZSUENzQkxFNTUKZXZaM2c3dFZTSHRBUUVWYmlkdjJoWlBMZ3lPL0JmUmExQmdULzJWNDRN
bkZxbXVhVjZPV0FxeGRuMTNGbU5jaAo5L3BXMFhYWUQrMkNPWU9DYkcvbwo9ZHIvcgotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============6301925958548310281==--