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] dejagnu: Update to 1.6
Date: Fri, 20 May 2016 11:07:25 +0100
Message-ID: <1463738845.19435.41.camel@ipfire.org>
In-Reply-To: <1463671583-3604-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1056133095921547539=="
List-Id: <development.lists.ipfire.org>

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

On Thu, 2016-05-19 at 17:26 +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| 15 ++--
> =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, 9 insertions(+), 157 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..22e0fd3 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,11 +17,13 @@ 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 \
> @@ -32,9 +34,10 @@ build
> =C2=A0	#	make check
> =C2=A0	#endef
> =C2=A0
> -	install_cmds
> -		make -C doc DESTDIR=3D%{BUILDROOT} install-man
> -	end
> +	#commented out because no target in 1.6
> +	#install_cmds
> +	#	make -C doc DESTDIR=3D%{BUILDROOT} install-man
> +	#end

Just remove those lines if they are not used any more.

It is okay to use comments for the test suite above because that actually
transports some information. In this case you could still have a look at the =
git
history to find out what a previous version of the file looked like.

> =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

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

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlhQdUhkQUFvSkVJQjU4UDl2a0FrSEN0TVFBSlVja3RIWStIb01QRmlxUUd3d1FUblgK
dXBLNlFHQU5pOWlvWlIxOFBTSmxqTmxDYW0rNC9IMlpmVzdlYTM0V3lXWVBxZXVoM2tvTzNlM1BR
OUFvV2JYMgphQTMzaVg3TkJRVnZndWNVdk5WSUxtU0M1dU0zMFdHdTBpcHA4MzJmUGtsSEtXcW5B
WGp4ZW1xQUVEOUU4OWRECmpnZ3d1KzdoQ200M3VDejN1b3FXQXYwUkR0VjNkd3J6dzJyeStsZ1Jx
Wk1IaUxlR0oxd2VWTzBBOFJzZDBma2UKNXVxazhpS2NoY1h5VmZxdVpWVWFzVkxVNHBQSHE3djQ0
YnFmeERmY2Y4TlNPcVlLTXYxeFpJdllWdml4dEVVcQpjdjl1ajgrYStlVG84Y1daNWRXZU80ZlR5
SFZzdEUwTkg3SXVCbEVSY2k4T2d0bDdLR2R3WVc4K0RYZGthS2xNCnc0cTVWK1dSYnFXbS9jL1NK
eWtvZ1JSMkFYV2VSdElJR2FubE5ObG9SVy9nNGpBN2d1aHFTZFp0OVdJZHJpMXMKNVJ4eVJKMHIz
OTVqQzhjWFcrM1dRTGFHR0VtYlUxWTVlelFQcXptOFhDMjRlY3oyMkU2NVlsOTN3cXpNa3hTSgoz
M0hhYUdaUlo5bGlEUVFOUmk5T0RFS0g4eXdVU1ZsRG8wVjhFMVNhU0dySWNOTTIyUTVRYVNHUFNI
ZXUrWXdyCjd3Q3FQOFk3bnFYenRHUzZkVFdlTVdyb2JHZEhXakdnaUEvOU05L01kZ1FKY3FrcDRV
bFlUWG5YMDNDeDNXVzMKR1h4N1E5emFKYVMza3BqM1VLMW1GczNiRVhZSC9Dam5QMVY4blorTTVw
Y0EzZVZYc09WYnIxbFpETHpJUGxwVgovRkx2aDRWMU1XellEd2dNMnhPUQo9bXZLWAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============1056133095921547539==--