From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] dejagnu: Update to 1.6 Date: Thu, 19 May 2016 17:26:23 +0200 Message-ID: <1463671583-3604-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0677661104279520936==" List-Id: --===============0677661104279520936== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fixes: #11101 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. Signed-off-by: Alexander Marx --- dejagnu/dejagnu.nm | 15 ++-- dejagnu/patches/dejagnu-1.4.4-runtest.patch | 12 --- dejagnu/patches/dejagnu-1.4.4-smp-1.patch | 26 ------- dejagnu/patches/dejagnu-1.4.4-testsuite.patch | 93 ---------------------= -- dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch | 20 ----- 5 files changed, 9 insertions(+), 157 deletions(-) delete mode 100644 dejagnu/patches/dejagnu-1.4.4-runtest.patch delete mode 100644 dejagnu/patches/dejagnu-1.4.4-smp-1.patch delete mode 100644 dejagnu/patches/dejagnu-1.4.4-testsuite.patch delete mode 100644 dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch 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 @@ ############################################################################= ### =20 name =3D dejagnu -version =3D 1.4.4 -release =3D 2 +version =3D 1.6 +release =3D 1 arch =3D noarch =20 groups =3D Development/Tools @@ -17,11 +17,13 @@ description DejaGnu is an Expect/Tcl based framework for testing other programs. end =20 -source_dl =3D +source_dl =3D http://mirror.netcologne.de/gnu/dejagnu/ +sources =3D %{thisapp}.tar.gz =20 build requires bison + expect end =20 configure_options +=3D \ @@ -32,9 +34,10 @@ build # make check #endef =20 - 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 end =20 packages diff --git a/dejagnu/patches/dejagnu-1.4.4-runtest.patch b/dejagnu/patches/de= jagnu-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 @@ - global tool -=20 - clone_output "Running $test_file_name ..." -- set prms_id 0 -- set bug_id 0 -+ reset_vars - set test_result "" -=20 - if [file exists $test_file_name] { diff --git a/dejagnu/patches/dejagnu-1.4.4-smp-1.patch b/dejagnu/patches/deja= gnu-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 - # programs that bear children. We can't use tcl's exec because it has - # no way to timeout programs that hang. *sigh* - # -+ # The expect command will close the connection when it sees EOF. On -+ # SMP machine, close the connection may send SIGHUP to the child -+ # and cause it to exit before it can exit normally. We should make -+ # the child to ignore SIGHUP. - if { "$inp" =3D=3D "" && "$outp" =3D=3D "" } { - set id -1 -- set result [catch "eval spawn \{${commandline}\}" pid] -+ set result [catch "eval spawn -ignore SIGHUP \{${commandline}\}" pid] - if { $result =3D=3D 0 } { - set result2 0 - } else { -@@ -134,7 +138,7 @@ proc local_exec { commandline inp outp t - return [list -1 "open of $commandline $inp $outp failed: $errorInfo"] - } - set pid [pid $id] -- set result [catch "spawn -leaveopen $id" result2] -+ set result [catch "spawn -ignore SIGHUP -leaveopen $id" result2] - } - # Prepend "-" to each pid, to generate the "process group IDs" needed by - # 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/tests= uite/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.000000= 000 +0200 -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include -=20 - using namespace std; -=20 -@@ -49,12 +50,8 @@ main (int argc, char *argv[]) { - // Replace the output buffer for cout, so we can examine it to - // see what was displayed. Otherwise, there is no way we can test - // the logging functions completely. -- char bbuuff[5120]; --#ifdef __STDC_HOSTED__ -- cout.rdbuf()->pubsetbuf(bbuuff, 5120); --#else -- cout.rdbuf()->setbuf(bbuuff, 5120); --#endif -+ stringstream stream; -+ streambuf * buf =3D cout.rdbuf(stream.rdbuf()); -=20 - testClass1.tname =3D "testType1"; - testClass1.tnum =3D 1; -@@ -65,53 +62,59 @@ main (int argc, char *argv[]) { -=20 - // Test the pass message - test.pass ("bogus pass message for testing"); -+ cout.flush(); - outstate =3D os2; -- if (strncmp(bbuuff, "\tPAS: bogus pass message", 22) =3D=3D 0) { -+ if (strncmp(stream.str().c_str(), "\tPAS: bogus pass message", 22) =3D= =3D 0) { - runtest.pass ("Pass message"); - } else { - runtest.fail ("Pass message"); - } -+ stream.str(""); -=20 - // Test the fail message - outstate =3D os1; - test.fail ("bogus fail message for testing"); - cout.flush(); - outstate =3D os2; -- if (strncmp(bbuuff, "\tFAI: bogus fail message", 22) =3D=3D 0) { -+ if (strncmp(stream.str().c_str(), "\tFAI: bogus fail message", 22) =3D= =3D 0) { - runtest.pass ("Fail message"); - } else { - runtest.fail ("Fail message"); - } -+ stream.str(""); -=20 - // Test the untested message - outstate =3D os1; - test.untested ("bogus untested message for testing"); - cout.flush(); - outstate =3D os2; -- if (strncmp(bbuuff, "\tUNT: bogus untested message", 21) =3D=3D 0) { -+ if (strncmp(stream.str().c_str(), "\tUNT: bogus untested message", 21) = =3D=3D 0) { - runtest.pass ("Untested message"); - } else { - runtest.fail ("Untested message"); - } -+ stream.str(""); -=20 - // Test the unresolved message - outstate =3D os1; - test.unresolved ("bogus unresolved message for testing"); - cout.flush(); - outstate =3D os2; -- if (strncmp(bbuuff, "\tUNR: bogus unresolved message", 21) =3D=3D 0) { -+ if (strncmp(stream.str().c_str(), "\tUNR: bogus unresolved message", 21= ) =3D=3D 0) { - runtest.pass ("Unresolved message"); - } else { - runtest.fail ("Unresolved message"); - } -+ stream.str(""); -=20 - // Make sure we got everything in the totals - regcomp (®ex_pat, "\r\n\t#passed.*#failed.*#untested.*#unresolved", = REG_NOSUB|REG_NEWLINE); -- if (regexec (®ex_pat, bbuuff, 0, (regmatch_t *)0, 0)) { -+ if (regexec (®ex_pat, stream.str().c_str(), 0, (regmatch_t *)0, 0)) { - runtest.pass ("Totals message"); - } else { - runtest.fail ("Totals message"); - } --} -- -+ stream.str(""); -=20 -+ cout.rdbuf(buf); -+} diff --git a/dejagnu/patches/dejagnu-1.4.4-utils-speedup.patch b/dejagnu/patc= hes/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 } { - foreach i $dirs { - verbose "Looking in $i" 3 - foreach match [glob -nocomplain $i/$pattern] { -- if ![file isdirectory $match] { -+ if {![file isdirectory $match]} { - lappend files $match - verbose "Adding $match to file list" 3 - } -@@ -216,7 +216,7 @@ proc prune { list pattern } { - set tmp {} - foreach i $list { - verbose "Checking pattern \"$pattern\" against $i" 3 -- if ![string match $pattern $i] { -+ if {![string match $pattern $i]} { - lappend tmp $i - } else { - verbose "Removing element $i from list" 3 --=20 2.6.3 --===============0677661104279520936==--