[Pkg-octave-commit] [SCM] dynare branch, master, updated. ef1d4d7f8b7ec1f4ca209a94db081ad3457aa722

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 0e542385c8c55fe457293452dcdb4803ae9037fe
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Oct 26 11:12:29 2009 +0100

    Better workaround for bug #550823

diff --git a/debian/changelog b/debian/changelog
index ad820c4..14bc381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dynare (4.0.4-6) UNRELEASED; urgency=low
+
+  * debian/patches/testsuite-octave3.2-crash-workaround:
+    Better workaround for bug #550823.
+
+ -- Sébastien Villemot <sebastien.villemot at ens.fr>  Thu, 15 Oct 2009 16:52:01 +0200
+
 dynare (4.0.4-5) unstable; urgency=low
 
   * Pass --no-history flag to Octave at build time, to avoid writing to a
diff --git a/debian/patches/testsuite-octave3.2-crash-workaround b/debian/patches/testsuite-octave3.2-crash-workaround
index 2ba4c67..2cc978c 100644
--- a/debian/patches/testsuite-octave3.2-crash-workaround
+++ b/debian/patches/testsuite-octave3.2-crash-workaround
@@ -1,17 +1,17 @@
-Exiting an Octave 3.2 where gnuplot has been used, and then immediately
-relaunching another instance of Octave triggers very strange bugs. This is
-probably related to the issue discussed in that thread:
-https://www-old.cae.wisc.edu/pipermail/help-octave/2009-August/015751.html
-
-An ugly workaround is to add a pause between two executions of Octave.
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -31,7 +31,7 @@
- ifdef OCTAVE
- 	@set -e; \
- 		for modfile in $(OCTAVE_MODS); do \
--			GNUTERM=dumb $(OCTAVE) --norc --silent --no-history run_test_octave.m $$modfile $(DYNARE_ROOT) $(DYNARE_VERSION); \
-+			GNUTERM=dumb $(OCTAVE) --norc --silent --no-history run_test_octave.m $$modfile $(DYNARE_ROOT) $(DYNARE_VERSION); sleep 1; \
- 		done
- endif
- .PHONY: check-octave
+Workaround for Octave 3.2 bug reported as #550823 in the BTS.
+--- a/matlab/dynare.m
++++ b/matlab/dynare.m
+@@ -89,6 +89,13 @@
+ for i=2:nargin
+   command = [command ' ' varargin{i-1}];
+ end
++
++if exist('OCTAVE_VERSION')
++    % Workaround for Octave 3.2 bug
++    % See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550823
++    sleep(2);
++end
++
+ [status, result] = system(command);
+ disp(result)
+ if status

-- 
dynare