[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#799219: marked as done (pu: package dejagnu/1.5.1-2+deb8u1)

Your message dated Sat, 20 Feb 2016 12:04:24 +0000
with message-id <20160220120424.GT6200@betterave.cristau.org>
and subject line Re: Bug#799219: pu: package dejagnu/1.5.1-2+deb8u1
has caused the Debian Bug report #799219,
regarding pu: package dejagnu/1.5.1-2+deb8u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
799219: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799219
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

this is triggered by a recent discussion on

  https://gcc.gnu.org/ml/gcc/2015-09/msg00206.html

The upstream commit is included in 1.5.3, and can be backported to 1.5 and
1.5.1. It will allow testing of newer GCC builds on 14.04 LTS and 15.04.

The commit is taken from
http://git.savannah.gnu.org/cgit/dejagnu.git/commit/?id=5481f29161477520c691d525653323b82fa47ad7

Acceptance criteria: The test suite passes, including the newly added test.

The test suite is disabled by default. I checked that the testsuite passes
(including the new test case) without regressions, in a clean jessie chroot.

Strictly not a bug fix, but an extension.

Matthias

diff -Nru dejagnu-1.5.1/debian/changelog dejagnu-1.5.1/debian/changelog
--- dejagnu-1.5.1/debian/changelog	2014-09-23 22:10:23.000000000 +0000
+++ dejagnu-1.5.1/debian/changelog	2015-09-16 22:24:50.000000000 +0000
@@ -1,3 +1,10 @@
+dejagnu (1.5.1-2+deb8u1) stable-proposed-updates; urgency=medium
+
+  * New variable libdirs. The global variable libdirs, handled as a list,
+    is appended to the default fixed paths built into DejaGnu.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 17 Sep 2015 00:24:05 +0200
+
 dejagnu (1.5.1-2) unstable; urgency=medium
 
   * Upload to unstable 
diff -Nru dejagnu-1.5.1/debian/patches/libdirs.diff dejagnu-1.5.1/debian/patches/libdirs.diff
--- dejagnu-1.5.1/debian/patches/libdirs.diff	1970-01-01 00:00:00.000000000 +0000
+++ dejagnu-1.5.1/debian/patches/libdirs.diff	2015-09-16 22:25:07.000000000 +0000
@@ -0,0 +1,206 @@
+From 5481f29161477520c691d525653323b82fa47ad7 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+Date: Mon, 17 Jun 2013 09:22:10 +0000
+Subject: 	* runtest.exp (libdirs): New global variable.
+
+	(load_lib): Append libdirs to search_and_load_files directories.
+	* doc/ref.xml (load_lib): Document global variable libdirs.
+	* doc/dejagnu.texi: Regenerate.
+	* testsuite/runtest.all/load_lib.exp: New testcase.
+	* Makefile.am (TESTSUITE_FILES): Add new testcase.
+	* Makefile.in: Regenerate.
+
+Signed-off-by: Ben Elliston <bje@gnu.org>
+---
+
+2013-06-17  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
+
+	* runtest.exp (libdirs): New global variable.
+	(load_lib): Append libdirs to search_and_load_files directories.
+	* doc/ref.xml (load_lib): Document global variable libdirs.
+	* doc/dejagnu.texi: Regenerate.
+	* testsuite/runtest.all/load_lib.exp: New testcase.
+	* Makefile.am (TESTSUITE_FILES): Add new testcase.
+	* Makefile.in: Regenerate.
+
+ 
+diff --git a/Makefile.am b/Makefile.am
+index ac60114..7789e4d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -233,6 +233,7 @@ TESTSUITE_FILES = \
+ 	testsuite/runtest.all/clone_output.test \
+ 	testsuite/runtest.all/config.test \
+ 	testsuite/runtest.all/default_procs.tcl \
++	testsuite/runtest.all/load_lib.exp \
+ 	testsuite/config/default.exp \
+ 	testsuite/lib/libsup.exp \
+ 	testsuite/lib/util-defs.exp \
+diff --git a/Makefile.in b/Makefile.in
+index 1171a38..86c92cc 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -478,6 +478,7 @@ TESTSUITE_FILES = \
+ 	testsuite/runtest.all/clone_output.test \
+ 	testsuite/runtest.all/config.test \
+ 	testsuite/runtest.all/default_procs.tcl \
++	testsuite/runtest.all/load_lib.exp \
+ 	testsuite/config/default.exp \
+ 	testsuite/lib/libsup.exp \
+ 	testsuite/lib/util-defs.exp \
+diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
+index f53291d..9e6c606 100644
+--- a/doc/dejagnu.texi
++++ b/doc/dejagnu.texi
+@@ -4257,7 +4257,8 @@ to print string without a trailing newline.  Use the optional
+ @node load_lib procedure, , verbose procedure, Core Internal Procedures
+ @subsubsection Load_lib Procedure
+ 
+-Loads a DejaGnu library file by searching a fixed path built
++Loads a DejaGnu library file by searching the default fixed paths
++built
+ into DejaGnu. If DejaGnu has been installed, it looks in a path
+ starting with the installed library directory.  If you are running
+ DejaGnu directly from a source directory, without first running
+@@ -4279,6 +4280,20 @@ The name of the DejaGnu library file to
+ load.
+ @end table
+ 
++The global variable @code{libdirs}, handled
++as a list, is appended to the default fixed paths built
++into DejaGnu.
++
++@strong{Additional search directories for load_lib}
++
++@example
++# append a non-standard search path
++	    global libdirs
++	    lappend libdirs $srcdir/../../gcc/testsuite/lib
++	    # now loading $srcdir/../../gcc/testsuite/lib/foo.exp works
++	    load_lib foo.exp
++@end example
++
+ @node Procedures For Remote Communication, connprocs, Core Internal Procedures, Builtin Procedures
+ @subsection Procedures For Remote Communication
+ 
+diff --git a/doc/ref.xml b/doc/ref.xml
+index b366207..18ae3bc 100644
+--- a/doc/ref.xml
++++ b/doc/ref.xml
+@@ -1015,7 +1015,8 @@
+ 	<sect4 id="loadlib" xreflabel="load_lib procedure">
+ 	  <title>Load_lib Procedure</title>
+ 
+-	  <para>Loads a &dj; library file by searching a fixed path built
++	  <para>Loads a &dj; library file by searching the default fixed paths
++	  built
+ 	  into &dj;. If &dj; has been installed, it looks in a path
+ 	  starting with the installed library directory.  If you are running
+ 	  &dj; directly from a source directory, without first running
+@@ -1038,6 +1039,18 @@
+ 	    load.</para></listitem>
+           </varlistentry>
+ 	</variablelist>
++	  <para>The global variable <parameter>libdirs</parameter>, handled
++	  as a list, is appended to the default fixed paths built
++	  into &dj;.</para>
++	  <example>
++	    <title>Additional search directories for <function>load_lib</function></title>
++	    <programlisting># append a non-standard search path
++	    global libdirs
++	    lappend libdirs $srcdir/../../gcc/testsuite/lib
++	    # now loading $srcdir/../../gcc/testsuite/lib/foo.exp works
++	    load_lib foo.exp</programlisting>
++	  </example>
++
+ 	</sect4>
+ 
+     </sect3>
+diff --git a/runtest.exp b/runtest.exp
+index 78da782..bd39dd8 100644
+--- a/runtest.exp
++++ b/runtest.exp
+@@ -589,7 +589,7 @@ proc lookfor_file { dir name } {
+ # source tree, (up one or two levels), then in the current dir.
+ #
+ proc load_lib { file } {
+-    global verbose libdir srcdir base_dir execpath tool
++    global verbose libdir libdirs srcdir base_dir execpath tool
+     global loaded_libs
+ 
+     if {[info exists loaded_libs($file)]} {
+@@ -597,8 +597,11 @@ proc load_lib { file } {
+     }
+ 
+     set loaded_libs($file) ""
+-
+-    if { [search_and_load_file "library file" $file [list ../lib $libdir $libdir/lib [file dirname [file dirname $srcdir]]/dejagnu/lib $srcdir/lib $execpath/lib . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/lib]] == 0 } {
++    set search_dirs [list ../lib $libdir $libdir/lib [file dirname [file dirname $srcdir]]/dejagnu/lib $srcdir/lib $execpath/lib . [file dirname [file dirname [file dirname $srcdir]]]/dejagnu/lib]
++    if {[info exists libdirs]} {
++        lappend search_dirs $libdirs
++    }
++    if { [search_and_load_file "library file" $file $search_dirs ] == 0 } {
+ 	send_error "ERROR: Couldn't find library file $file.\n"
+ 	exit 1
+     }
+@@ -652,6 +655,8 @@ set libdir   [file dirname $execpath]/dejagnu
+ if {[info exists env(DEJAGNULIBS)]} {
+     set libdir $env(DEJAGNULIBS)
+ }
++# list of extra search directories used by load_lib to look for libs
++set libdirs {}
+ 
+ verbose "Using $libdir to find libraries"
+ 
+diff --git a/testsuite/runtest.all/load_lib.exp b/testsuite/runtest.all/load_lib.exp
+new file mode 100644
+index 0000000..55a3a07
+--- a/dev/null
++++ b/testsuite/runtest.all/load_lib.exp
+@@ -0,0 +1,44 @@
++# test load_lib
++
++# Verify that load_lib searches for a lib not only in it's default
++# search_dirs but also in the libdirs list of directories.
++
++# load_lib f exits with a failure if it does not find f.
++# Arrange for the testcase to handle this:
++rename exit saved_exit
++proc exit { args } { return [lindex $args 0] }
++
++# The test right below is supposed to fail.
++# Prettify default output by only printing the message in verbose mode.
++rename send_error saved_send_error
++proc send_error { args } {
++  verbose [lindex $args 0] 2
++}
++
++if { [ load_lib "subfile1" ] != 1} {
++    fail "load_lib subfile1 found per default"
++} else {
++    pass "load_lib subfile1 not found per default"
++}
++
++rename send_error ""
++rename saved_send_error send_error
++
++set extradir [file join $srcdir $subdir "topdir" "subdir1" ]
++global libdirs
++lappend libdirs $extradir
++verbose "now added libdirs: $libdirs" 2
++
++# In this testcase, we did not exit 1 from load_lib as per above rename.
++# subfile1 thus is in the loaded_libs LUT and we won't walk the
++# search_dirs again. Use another file for testing the lappend worked.
++
++if { [load_lib "subfile2"] == ""} {
++    pass "load_lib subfile2 loaded"
++} else {
++    fail "load_lib subfile2 not found"
++}
++
++# cleanup after us
++rename exit ""
++rename saved_exit exit
+--
+cgit v0.9.0.2
diff -Nru dejagnu-1.5.1/debian/patches/series dejagnu-1.5.1/debian/patches/series
--- dejagnu-1.5.1/debian/patches/series	2011-07-13 23:19:06.000000000 +0000
+++ dejagnu-1.5.1/debian/patches/series	2015-09-16 22:25:24.000000000 +0000
@@ -1 +1,2 @@
 env-timeout.patch
+libdirs.diff

--- End Message ---
--- Begin Message --- 
On Thu, Sep 17, 2015 at 00:34:33 +0200, Matthias Klose wrote:

> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> this is triggered by a recent discussion on
> 
>   https://gcc.gnu.org/ml/gcc/2015-09/msg00206.html
> 
> The upstream commit is included in 1.5.3, and can be backported to 1.5 and
> 1.5.1. It will allow testing of newer GCC builds on 14.04 LTS and 15.04.
> 
> The commit is taken from
> http://git.savannah.gnu.org/cgit/dejagnu.git/commit/?id=5481f29161477520c691d525653323b82fa47ad7
> 
> Acceptance criteria: The test suite passes, including the newly added test.
> 
> The test suite is disabled by default. I checked that the testsuite passes
> (including the new test case) without regressions, in a clean jessie chroot.
> 
> Strictly not a bug fix, but an extension.
> 
I'm afraid this doesn't fit criteria for stable updates, if you need a
newer dejagnu release the way to go is jessie-backports, IMO.

Cheers,
Julien

--- End Message ---
Reply to: