Run test-suite with MERCURY_SUPPRESS_STACK_TRACE=yes

(Portage version: 2.1.2-r12)

3 files changed, 401 insertions, 38 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 49253569da10..258c8995d5c6 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.78 2007/01/16 09:11:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.79 2007/03/02 23:43:00 keri Exp $
+
+  02 Mar 2007; keri <keri@gentoo.org>
+  -files/mercury-0.13.1-tests-tabling_inf_recursion.patch,
+  mercury-0.13.1-r1.ebuild:
+  Run test-suite with MERCURY_SUPPRESS_STACK_TRACE=yes
 
   16 Jan 2007; keri <keri@gentoo.org>
   files/mercury-0.13.1-tests-workspace.patch:
@@ -28,3 +33,396 @@
   mercury-0.12.2-r4.ebuild, mercury-0.13.1-r1.ebuild:
   Multilib support of libgrades.
 
+  11 Jan 2007; keri <keri@gentoo.org>
+  +files/mercury-0.13.1-tests-workspace.patch, mercury-0.13.1-r1.ebuild:
+  Handle workspace flags when running against the Mercury test-suite.
+
+  09 Jan 2007; keri <keri@gentoo.org> mercury-0.13.1-r1.ebuild:
+  Add ~amd64 to KEYWORDS.
+
+  08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch:
+  Merge unboxed_float fix into bootstrap patch.
+
+  08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch,
+  -files/mercury-0.12.2-unboxed_floats.patch,
+  files/mercury-0.13.1-bootstrap.patch,
+  -files/mercury-0.13.1-unboxed_floats.patch, mercury-0.12.2-r4.ebuild,
+  mercury-0.13.1-r1.ebuild:
+  Do not rebuild C files in a stage1 bootstrap without a Mercury compiler handy.
+
+  07 Jan 2007; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-unboxed_floats.patch,
+  +files/mercury-0.13.1-unboxed_floats.patch, mercury-0.12.2-r4.ebuild,
+  mercury-0.13.1-r1.ebuild:
+  Unboxed float fix on stage1 bootstrap.
+
+  07 Jan 2007; keri <keri@gentoo.org>
+  +files/mercury-0.13.1-tests-dir_test.patch,
+  +files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch,
+  +files/mercury-0.13.1-tests-mdbrc.patch,
+  +files/mercury-0.13.1-tests-string_format.patch,
+  +files/mercury-0.13.1-tests-tabling_inf_recursion.patch,
+  mercury-0.13.1-r1.ebuild:
+  Mercury testcase shakeup.
+
+  07 Jan 2007; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-tests-dir_test.patch,
+  +files/mercury-0.12.2-tests-foreign_decl_line_number.patch,
+  +files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch,
+  +files/mercury-0.12.2-tests-mdbrc.patch,
+  +files/mercury-0.12.2-tests-string_format.patch,
+  +files/mercury-0.12.2-tests-tabling_inf_recursion.patch,
+  mercury-0.12.2-r4.ebuild:
+  Fix 64bit string_format_o test.
+
+*mercury-0.13.1-r1 (30 Dec 2006)
+
+  30 Dec 2006; keri <keri@gentoo.org>
+  +files/mercury-0.13.1-profdeep-builtin_throw.patch,
+  +mercury-0.13.1-r1.ebuild:
+  Ensure the proc_layout structure for builtin_throw in exception.m is
+  externally visible.
+
+*mercury-0.12.2-r4 (30 Dec 2006)
+
+  30 Dec 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-profdeep-builtin_throw.patch,
+  +mercury-0.12.2-r4.ebuild:
+  Enable the mercury deep-profiler.
+
+*mercury-0.13.1 (04 Dec 2006)
+
+  04 Dec 2006; keri <keri@gentoo.org> +files/mercury-0.13.1-CFLAGS.patch,
+  +files/mercury-0.13.1-LIBDIR.patch, +files/mercury-0.13.1-MAKEOPTS.patch,
+  +files/mercury-0.13.1-bootstrap.patch,
+  +files/mercury-0.13.1-deep_profiler.patch,
+  +files/mercury-0.13.1-docs.patch, +files/mercury-0.13.1-libgrades.patch,
+  +files/mercury-0.13.1-parallel-install_grades.patch,
+  +files/mercury-0.13.1-portage.patch, +files/mercury-0.13.1-tests.patch,
+  +mercury-0.13.1.ebuild:
+  Version bump.
+
+  23 Nov 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-pic_o-dependencies.patch,
+  +files/mercury-0.13.0-pic_o-dependencies.patch, mercury-0.12.2-r3.ebuild,
+  mercury-0.13.0.ebuild:
+  Generate dependencies on .mh files for both .o and .pic_o files. Reported by
+  M. Edward Borasky <znmeb@cesmail.net> in #154523.
+
+  10 Nov 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
+  Generate _init.c files after all C files have been generated.
+
+  06 Nov 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
+  Disable profdeep grades.
+
+  24 Oct 2006; keri <keri@gentoo.org> -files/mercury-0.12.2-portage.patch,
+  -files/mercury-0.12.2-portage-r1.patch,
+  -files/mercury-0.12.2-portage-r2.patch,
+  -files/mercury-0.13.0-mkinit.patch, -mercury-0.12.2.ebuild,
+  -mercury-0.12.2-r1.ebuild, -mercury-0.12.2-r2.ebuild:
+  Remove old revisions that don't support parallel build.
+
+  23 Oct 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-parallel-install_grades.patch,
+  +files/mercury-0.13.0-parallel-install_grades.patch,
+  mercury-0.12.2-r3.ebuild, mercury-0.13.0.ebuild:
+  Parallelize install_grades target in Mmake.rules.
+
+  19 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2.ebuild,
+  mercury-0.12.2-r1.ebuild, mercury-0.12.2-r2.ebuild,
+  mercury-0.12.2-r3.ebuild, mercury-0.13.0.ebuild:
+  Update SRC_URI.
+
+  18 Oct 2006; Joshua Jackson <tsunam@gentoo.org> mercury-0.12.2-r3.ebuild:
+  Stable x86; bug #149924
+
+  15 Oct 2006; keri <keri@gentoo.org> files/mercury-0.13.0-tests.patch:
+  Do not use the set command in mdbrc.
+
+  14 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
+  Add ~sparc keyword.
+
+  14 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
+  Add $(MakeVarName.cs) to InitFile target in dep files for stage2 bootstrap.
+
+  14 Oct 2006; keri <keri@gentoo.org> +files/mercury-0.13.0-mkinit.patch,
+  mercury-0.13.0.ebuild:
+  Ensure mmc generates .c files before mkinit is run.
+
+  12 Oct 2006; keri <keri@gentoo.org> mercury-0.13.0.ebuild:
+  Do not pre-strip binaries.
+
+  12 Oct 2006; keri <keri@gentoo.org> files/mercury-0.13.0-libgrades.patch:
+  Update libgrades compilation.
+
+  07 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
+  Do not pre-strip binaries.
+
+  05 Oct 2006; <nixnut@gentoo.org> mercury-0.12.2-r3.ebuild:
+  Stable on ppc wrt bug 149924
+
+  04 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
+  Add ~sparc keyword.
+
+  03 Oct 2006; keri <keri@gentoo.org> files/mercury-0.12.2-tests.patch:
+  Fix string_format tests for 64bit architectures.
+
+  03 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
+  Add ~amd64 keyword.
+
+  18 Sep 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
+  Disable deepprof libgrades.
+
+  17 Sep 2006; keri <keri@gentoo.org>
+  +files/mercury-0.12.2-deep_profiler.patch,
+  +files/mercury-0.13.0-deep_profiler.patch, mercury-0.12.2-r3.ebuild,
+  mercury-0.13.0.ebuild:
+  Add support for Mercury deep profiler.
+
+  16 Sep 2006; keri <keri@gentoo.org>
+  -files/mercury-0.13.0_beta-CFLAGS.patch,
+  -files/mercury-0.13.0_beta-LIBDIR.patch,
+  -files/mercury-0.13.0_beta-MAKEOPTS.patch,
+  -files/mercury-0.13.0_beta-bootstrap.patch,
+  -files/mercury-0.13.0_beta-docs.patch,
+  -files/mercury-0.13.0_beta-libgrades.patch,
+  -files/mercury-0.13.0_beta-portage.patch,
+  -files/mercury-0.13.0_beta-tests.patch,
+  -mercury-0.13.0_beta20060907.ebuild:
+  Remove 0.13.0_beta development snapshot.
+
+  16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-MAKEOPTS.patch,
+  files/mercury-0.12.2-libgrades.patch, files/mercury-0.13.0-MAKEOPTS.patch,
+  files/mercury-0.13.0-libgrades.patch:
+  Run mmake depend in stage 2 bootstrap.
+
+  16 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-libgrades.patch,
+  files/mercury-0.13.0-libgrades.patch:
+  Parallelize compilation of libgrades.
+
+*mercury-0.13.0 (16 Sep 2006)
+
+  16 Sep 2006; keri <keri@gentoo.org> +files/mercury-0.13.0-CFLAGS.patch,
+  +files/mercury-0.13.0-LIBDIR.patch, +files/mercury-0.13.0-MAKEOPTS.patch,
+  +files/mercury-0.13.0-bootstrap.patch, +files/mercury-0.13.0-docs.patch,
+  +files/mercury-0.13.0-libgrades.patch,
+  +files/mercury-0.13.0-portage.patch, +files/mercury-0.13.0-tests.patch,
+  +mercury-0.13.0.ebuild:
+  Version bump. The mercury-0.13.0 BOOTSTRAP_GRADE supports gcc4.
+
+  11 Sep 2006; keri <keri@gentoo.org> +files/mercury-0.12.2-MAKEOPTS.patch,
+  +files/mercury-0.13.0_beta-MAKEOPTS.patch, mercury-0.12.2-r3.ebuild,
+  mercury-0.13.0_beta20060907.ebuild:
+  Parallelize compilation.
+
+  10 Sep 2006; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch,
+  files/mercury-0.13.0_beta-bootstrap.patch:
+  Ensure PIC and non-PIC code is not mixed on x86.
+
+*mercury-0.13.0_beta20060907 (09 Sep 2006)
+
+  09 Sep 2006; keri <keri@gentoo.org>
+  files/mercury-0.13.0_beta-portage.patch,
+  -mercury-0.13.0_beta20060811.ebuild, +mercury-0.13.0_beta20060907.ebuild:
+  New development snapshot.
+
+  14 Aug 2006; Keri Harris <keri@gentoo.org>
+  files/mercury-0.12.2-tests.patch, mercury-0.12.2-r3.ebuild:
+  Run test-suite with DEFAULT_GRADE.
+
+  12 Aug 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.13.0_beta-LIBDIR.patch,
+  +files/mercury-0.13.0_beta-bootstrap.patch,
+  +files/mercury-0.13.0_beta-libgrades.patch,
+  files/mercury-0.13.0_beta-portage.patch,
+  mercury-0.13.0_beta20060811.ebuild:
+  Add two-stage bootstrap support.
+
+  12 Aug 2006; Keri Harris <keri@gentoo.org>
+  -mercury-0.13.0_beta20060623.ebuild:
+  Remove old development snapshot.
+
+*mercury-0.13.0_beta20060811 (12 Aug 2006)
+
+  12 Aug 2006; Keri Harris <keri@gentoo.org>
+  +mercury-0.13.0_beta20060811.ebuild:
+  New development snapshot.
+
+*mercury-0.12.2-r3 (12 Aug 2006)
+
+  12 Aug 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-bootstrap.patch,
+  +files/mercury-0.12.2-libgrades.patch,
+  +files/mercury-0.12.2-portage-r3.patch, +mercury-0.12.2-r3.ebuild:
+  Add two-stage bootstrap support.
+
+*mercury-0.13.0_beta20060623 (25 Jun 2006)
+
+  25 Jun 2006; Keri Harris <keri@gentoo.org>
+  -mercury-0.13.0_beta20060615.ebuild, +mercury-0.13.0_beta20060623.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta20060615 (17 Jun 2006)
+
+  17 Jun 2006; Keri Harris <keri@gentoo.org>
+  -files/mercury-0.13.0_beta-LIBDIR.patch,
+  files/mercury-0.13.0_beta-portage.patch,
+  +files/mercury-0.13.0_beta-tests.patch, mercury-0.12.2-r2.ebuild,
+  -mercury-0.13.0_beta20060609.ebuild, +mercury-0.13.0_beta20060615.ebuild:
+  New development snapshot incorporating support for threaded libgrades and
+  src_test.
+
+  17 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-portage-r2.patch, mercury-0.12.2-r2.ebuild:
+  Enable hlc.par.gc libgrade on a minimal install if threading is enabled.
+
+*mercury-0.12.2-r2 (16 Jun 2006)
+
+  16 Jun 2006; Keri Harris <keri@gentoo.org> +mercury-0.12.2-r2.ebuild:
+  Add thread-safe libgrade support.
+
+  14 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-portage-r1.patch, +files/mercury-0.12.2-tests.patch,
+  mercury-0.12.2-r1.ebuild:
+  Add src_test support for default libgrade.
+
+*mercury-0.13.0_beta20060609 (12 Jun 2006)
+
+  12 Jun 2006; Keri Harris <keri@gentoo.org>
+  -mercury-0.13.0_beta20060601.ebuild, +mercury-0.13.0_beta20060609.ebuild:
+  New development snapshot.
+
+  09 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.13.0_beta-LIBDIR.patch,
+  mercury-0.13.0_beta20060601.ebuild:
+  Add debug support to libgrades.
+
+*mercury-0.12.2-r1 (09 Jun 2006)
+
+  09 Jun 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-LIBDIR.patch, files/mercury-0.12.2-portage.patch,
+  +mercury-0.12.2-r1.ebuild:
+  Add debug support to libgrades. Append ${P} to install_libdir so that
+  mercury-extras can be upgraded.
+
+  04 Jun 2006; Keri Harris <keri@gentoo.org>
+  -mercury-0.13.0_beta20060517.ebuild, -mercury-0.13.0_beta20060525.ebuild:
+  Remove old development snapshots.
+
+*mercury-0.13.0_beta20060601 (04 Jun 2006)
+
+  04 Jun 2006; Keri Harris <keri@gentoo.org>
+  +mercury-0.13.0_beta20060601.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta20060525 (27 May 2006)
+
+  27 May 2006; Keri Harris <keri@gentoo.org>
+  +mercury-0.13.0_beta20060525.ebuild:
+  New development snapshot.
+
+  20 May 2006; Keri Harris <keri@gentoo.org>
+  -mercury-0.13.0_beta20060501.ebuild, -mercury-0.13.0_beta20060511.ebuild:
+  Remove old development snapshots from the tree.
+
+*mercury-0.13.0_beta20060517 (20 May 2006)
+
+  20 May 2006; Keri Harris <keri@gentoo.org>
+  +mercury-0.13.0_beta20060517.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta20060511 (13 May 2006)
+
+  13 May 2006; Keri Harris <keri@gentoo.org>
+  +mercury-0.13.0_beta20060511.ebuild:
+  New development snapshot.
+
+  13 May 2006; Keri Harris <keri@gentoo.org>
+  mercury-0.13.0_beta20060501.ebuild:
+  Change upstream SRC_URI.
+
+  13 May 2006; Keri Harris <keri@gentoo.org> -mercury-0.13.0_beta5.ebuild,
+  -mercury-0.13.0_beta6.ebuild, -mercury-0.13.0_beta7.ebuild,
+  -mercury-0.13.0_beta8.ebuild:
+  Remove old development snapshots from the tree.
+
+*mercury-0.13.0_beta20060501 (13 May 2006)
+
+  13 May 2006; Keri Harris <keri@gentoo.org>
+  +mercury-0.13.0_beta20060501.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta8 (02 May 2006)
+
+  02 May 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta8.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta7 (29 Apr 2006)
+
+  29 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta7.ebuild:
+  New development snapshot.
+
+  27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
+  Fixing SHA256 digest, pass four
+
+*mercury-0.13.0_beta6 (26 Apr 2006)
+
+  26 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta6.ebuild:
+  New development snapshot.
+
+  25 Apr 2006; Keri Harris <keri@gentoo.org> -mercury-0.13.0_beta.ebuild,
+  -mercury-0.13.0_beta-r1.ebuild, -mercury-0.13.0_beta2.ebuild,
+  -mercury-0.13.0_beta3.ebuild, -mercury-0.13.0_beta4.ebuild:
+  Remove old development snapshots from the tree.
+
+*mercury-0.13.0_beta5 (25 Apr 2006)
+
+  25 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta5.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta4 (22 Apr 2006)
+
+  22 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta4.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta3 (20 Apr 2006)
+
+  20 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta3.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta2 (19 Apr 2006)
+
+  19 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta2.ebuild:
+  New development snapshot.
+
+*mercury-0.13.0_beta-r1 (13 Apr 2006)
+
+  13 Apr 2006; Keri Harris <keri@gentoo.org> +mercury-0.13.0_beta-r1.ebuild:
+  Revbump to new development snapshot.
+
+*mercury-0.13.0_beta (07 Apr 2006)
+
+  07 Apr 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.13.0_beta-CFLAGS.patch,
+  +files/mercury-0.13.0_beta-docs.patch,
+  +files/mercury-0.13.0_beta-portage.patch, +mercury-0.13.0_beta.ebuild:
+  Version bump to development release.
+
+  27 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
+  Explicitly disable building dotnet grades. Thanks to Brian Danilko
+  <brian@likeablesoftware.com> in bug #127673
+
+  25 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
+  Add ~ppc keyword.
+
+  24 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
+  Updated install paths to respect ${PF}.
+
+*mercury-0.12.2 (23 Mar 2006)
+
+  23 Mar 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.12.2-CFLAGS.patch, +files/mercury-0.12.2-docs.patch,
+  +files/mercury-0.12.2-portage.patch, +metadata.xml,
+  +mercury-0.12.2.ebuild:
+  New ebuild. Based on an ebuild submitted by Ryan Kelly in bug #121234
+
diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-tabling_inf_recursion.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-tabling_inf_recursion.patch
deleted file mode 100644
index e8c8a76e648d..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-tabling_inf_recursion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN mercury-tests-0.13.1.orig/tabling/loopcheck.exp5 mercury-tests-0.13.1/tabling/loopcheck.exp5
---- mercury-tests-0.13.1.orig/tabling/loopcheck.exp5	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/loopcheck.exp5	2007-01-07 15:51:35.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck.loop/1
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.13.1/tabling/loopcheck_nondet.exp2
---- mercury-tests-0.13.1.orig/tabling/loopcheck_nondet.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/loopcheck_nondet.exp2	2007-01-07 15:51:35.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/tc_loop.exp3 mercury-tests-0.13.1/tabling/tc_loop.exp3
---- mercury-tests-0.13.1.orig/tabling/tc_loop.exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/tc_loop.exp3	2007-01-07 15:51:35.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_loop.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/tc_memo.exp2 mercury-tests-0.13.1/tabling/tc_memo.exp2
---- mercury-tests-0.13.1.orig/tabling/tc_memo.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/tc_memo.exp2	2007-01-07 15:51:35.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_memo.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/tc_memo2.exp2 mercury-tests-0.13.1/tabling/tc_memo2.exp2
---- mercury-tests-0.13.1.orig/tabling/tc_memo2.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/tc_memo2.exp2	2007-01-07 15:51:35.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected need for minimal model in pred tc_memo2.tc/2
-+Stack dump not available in this grade.
diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
index d86b27884e57..6ffefdb5e5d6 100644
--- a/dev-lang/mercury/mercury-0.13.1-r1.ebuild
+++ b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.8 2007/01/13 09:02:46 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.9 2007/03/02 23:43:00 keri Exp $
 
 inherit eutils
 
@@ -38,7 +38,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-tests-ho_and_type_spec_bug.patch
 	epatch "${FILESDIR}"/${P}-tests-mdbrc.patch
 	epatch "${FILESDIR}"/${P}-tests-string_format.patch
-	epatch "${FILESDIR}"/${P}-tests-tabling_inf_recursion.patch
 	epatch "${FILESDIR}"/${P}-tests-workspace.patch
 	sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" "${TESTDIR}"/mdbrc
 }
@@ -108,6 +107,7 @@ src_test() {
 	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
 	MMAKE_DIR="${TWS}"/scripts \
 	MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
 	GRADE=${TEST_GRADE} \
 	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
 					-I${TWS}/boehm_gc/include \