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

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 10ceb7a615ed34ab07825ae17f39ee2242ee859b
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Thu Sep 24 16:02:20 2009 +0200

    New patch implementing workaround for weird Octave 3.2.2 bug

diff --git a/debian/changelog b/debian/changelog
index b678f6e..cb082b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ dynare (4.0.4-4) unstable; urgency=low
     Remove references to mark_as_command (no longer needed in Octave 3.2).
   * debian/patches/mcmcdiagnostics:
     New patch for bug in metropolis-hastings diagnostics routine.
+  * debian/patches/testsuite-octave3.2-crash-workaround:
+    New patch implementing workaround for weird Octave 3.2.2 bug.
 
  -- Sébastien Villemot <sebastien.villemot at ens.fr>  Mon, 14 Sep 2009 14:10:42 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 411474a..cb5b509 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+testsuite-octave3.2-crash-workaround
 mcmcdiagnostics
 testsuite-fs2000
 rows-name-clash
diff --git a/debian/patches/testsuite-octave3.2-crash-workaround b/debian/patches/testsuite-octave3.2-crash-workaround
new file mode 100644
index 0000000..2ba4c67
--- /dev/null
+++ b/debian/patches/testsuite-octave3.2-crash-workaround
@@ -0,0 +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

-- 
dynare