Run test-suite with DEFAULT_GRADE.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 57 insertions, 32 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 4f3a0ea9e041..368e90ae0448 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.36 2006/08/12 05:59:00 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.37 2006/08/14 07:51:40 keri Exp $
+
+  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,
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 47fe6a4bca20..e117b31bfc5e 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -34,10 +34,10 @@ AUX mercury-0.12.2-portage.patch 2052 RMD160 3fdcd9a309c27da3cf539829413ca8b15d5
 MD5 bfc5cb304791178b3283d7cd48e750a7 files/mercury-0.12.2-portage.patch 2052
 RMD160 3fdcd9a309c27da3cf539829413ca8b15d5b50ab files/mercury-0.12.2-portage.patch 2052
 SHA256 80189cf0515f212f2756f5c944b9eab5db3acdece1404ab11a4e5eedcd1b42e0 files/mercury-0.12.2-portage.patch 2052
-AUX mercury-0.12.2-tests.patch 5622 RMD160 81f2ecfb77f556d7b34669834e56f550926069d6 SHA1 c1cd73d6658220945a5d667289e70b88ff06da9f SHA256 efde85a6808d479fb3f2ddffea297f09ab4c222597dad2c2e1be9d6ecf321e0d
-MD5 51efbe3f5889096eb70c40dfe4cb40d1 files/mercury-0.12.2-tests.patch 5622
-RMD160 81f2ecfb77f556d7b34669834e56f550926069d6 files/mercury-0.12.2-tests.patch 5622
-SHA256 efde85a6808d479fb3f2ddffea297f09ab4c222597dad2c2e1be9d6ecf321e0d files/mercury-0.12.2-tests.patch 5622
+AUX mercury-0.12.2-tests.patch 6200 RMD160 ae4f8df87b43dc4a33226a25ac182f425b6991a5 SHA1 f0f80dd41a3124d83f25f5640eb84f337ac48b2d SHA256 ac8b3d69f14b0b5c69d3bdaa4ef0a4dd5320ea5077967d0cccc7090fcdfd1501
+MD5 b9a0bb5c9579fc1c4b5295dcfba38efd files/mercury-0.12.2-tests.patch 6200
+RMD160 ae4f8df87b43dc4a33226a25ac182f425b6991a5 files/mercury-0.12.2-tests.patch 6200
+SHA256 ac8b3d69f14b0b5c69d3bdaa4ef0a4dd5320ea5077967d0cccc7090fcdfd1501 files/mercury-0.12.2-tests.patch 6200
 AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 SHA1 ccde9305e9ee1b1705ffc96de36fbb766dc1f12e SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58
 MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
@@ -78,10 +78,10 @@ EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 286e8b51c81abc84709a5bb3c4719d6dde08
 MD5 f4478bfcf7e5b674cd7e94c73ec9fb74 mercury-0.12.2-r2.ebuild 2049
 RMD160 286e8b51c81abc84709a5bb3c4719d6dde080c87 mercury-0.12.2-r2.ebuild 2049
 SHA256 19b2346e8cb3d86ebcb600ebd180d4fa2ebd9b79e285add3b34dd32363d75d61 mercury-0.12.2-r2.ebuild 2049
-EBUILD mercury-0.12.2-r3.ebuild 2578 RMD160 d15229f5e72d9a6c306d3628927b4c3a7ec4d02d SHA1 784fe33fb68e05f955ff92425cabed841b37053d SHA256 8c3738096222a887a45b3ac1cccbe5fb148d2f9fa8016772bca05b77288fab77
-MD5 b4f8d6e9eef7f7a32d4c02ee2e79e756 mercury-0.12.2-r3.ebuild 2578
-RMD160 d15229f5e72d9a6c306d3628927b4c3a7ec4d02d mercury-0.12.2-r3.ebuild 2578
-SHA256 8c3738096222a887a45b3ac1cccbe5fb148d2f9fa8016772bca05b77288fab77 mercury-0.12.2-r3.ebuild 2578
+EBUILD mercury-0.12.2-r3.ebuild 2912 RMD160 8ef37adfabae9971cfc060a36ba592d8472fed09 SHA1 cefe2c0ae3935b3c2590ff21a3bcd94b549332ab SHA256 4471560c74747614d7386e16872972170ca66e15eca954ab5a40f205fa14ee57
+MD5 01b53cd318c96b442e3d1bc87931a80e mercury-0.12.2-r3.ebuild 2912
+RMD160 8ef37adfabae9971cfc060a36ba592d8472fed09 mercury-0.12.2-r3.ebuild 2912
+SHA256 4471560c74747614d7386e16872972170ca66e15eca954ab5a40f205fa14ee57 mercury-0.12.2-r3.ebuild 2912
 EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 SHA1 8e8a9063248f02f94c4417a6c3f57626c04bd30b SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8
 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
@@ -90,10 +90,10 @@ EBUILD mercury-0.13.0_beta20060811.ebuild 2991 RMD160 b4e469127dfd9e85c0cbcbc191
 MD5 a844f3b6eca9b0fe4706a79c7adefa10 mercury-0.13.0_beta20060811.ebuild 2991
 RMD160 b4e469127dfd9e85c0cbcbc191f538b82526b114 mercury-0.13.0_beta20060811.ebuild 2991
 SHA256 9ba9cc2f8808ef035bd3e9571c837d6b96452a681010ef92bd026ff3e399e223 mercury-0.13.0_beta20060811.ebuild 2991
-MISC ChangeLog 6715 RMD160 539ca9399ffb6adb4187d62a217d2c8ed31a7059 SHA1 aecfdb53dee19f92629e22477e9be8ac87cc4b84 SHA256 8f3037b3c94f76673b01ce48ae33fd4ce1dfae0b4fb87a911406d346cf5b4448
-MD5 9bcb84d0434b9aa745649ed53dceeeb4 ChangeLog 6715
-RMD160 539ca9399ffb6adb4187d62a217d2c8ed31a7059 ChangeLog 6715
-SHA256 8f3037b3c94f76673b01ce48ae33fd4ce1dfae0b4fb87a911406d346cf5b4448 ChangeLog 6715
+MISC ChangeLog 6860 RMD160 2ba9744d6156e380fed055118fdf016da1978735 SHA1 6dd8aca5e643ea3c58ec01035607a2d0865e590d SHA256 62da13bcd0e9887f838ffeb72fc091958f1604554dc524466433306a3b358684
+MD5 fcd6f5ab8d9e9836038e6a84a4f15041 ChangeLog 6860
+RMD160 2ba9744d6156e380fed055118fdf016da1978735 ChangeLog 6860
+SHA256 62da13bcd0e9887f838ffeb72fc091958f1604554dc524466433306a3b358684 ChangeLog 6860
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests.patch b/dev-lang/mercury/files/mercury-0.12.2-tests.patch
index b158216d7a70..d250658e4373 100644
--- a/dev-lang/mercury/files/mercury-0.12.2-tests.patch
+++ b/dev-lang/mercury/files/mercury-0.12.2-tests.patch
@@ -1,6 +1,6 @@
 diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp mercury-tests-0.12.2/hard_coded/dir_test.exp
 --- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp	2006-06-11 18:52:41.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp	2006-08-13 21:25:10.000000000 +1200
 @@ -130,7 +130,6 @@
  "foo"/"bar/baz" = "foo\bar\baz".

  "foo/"/"bar/baz" = "foo\bar\baz".

@@ -11,7 +11,7 @@ diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp mercury-tests-0.12.2
  dir.make_single_directory with non-existent parent failed as expected.

 diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 mercury-tests-0.12.2/hard_coded/dir_test.exp2
 --- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp2	2006-06-11 18:48:26.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp2	2006-08-13 21:25:10.000000000 +1200
 @@ -127,7 +127,6 @@
  "foo"/"bar/baz" = "foo/bar/baz".
  "foo/"/"bar/baz" = "foo/bar/baz".
@@ -22,7 +22,7 @@ diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 mercury-tests-0.12.
  dir.make_single_directory with non-existent parent failed as expected.
 diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 mercury-tests-0.12.2/hard_coded/dir_test.exp3
 --- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp3	2006-06-11 18:51:44.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.exp3	2006-08-13 21:25:10.000000000 +1200
 @@ -130,7 +130,6 @@
  "foo"/"bar/baz" = "foo/bar/baz".
  "foo/"/"bar/baz" = "foo/bar/baz".
@@ -33,7 +33,7 @@ diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 mercury-tests-0.12.
  dir.make_single_directory with non-existent parent failed as expected.
 diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.m mercury-tests-0.12.2/hard_coded/dir_test.m
 --- mercury-tests-0.12.2.orig/hard_coded/dir_test.m	2003-08-05 22:50:33.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.m	2006-06-11 18:47:35.000000000 +1200
++++ mercury-tests-0.12.2/hard_coded/dir_test.m	2006-08-13 21:25:10.000000000 +1200
 @@ -50,16 +50,6 @@
  	io__write(ReadResult),
  	io__nl,
@@ -51,9 +51,16 @@ diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.m mercury-tests-0.12.2/h
  	{ Dir1 = "test_dir"/"d1" },
  	test0("make_directory", dir__make_directory(Dir1)),
  	% Test making a directory that already exists.
+diff -urN mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3 mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3
+--- mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3	1970-01-01 12:00:00.000000000 +1200
++++ mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3	2006-08-13 16:19:25.000000000 +1200
+@@ -0,0 +1,3 @@
++foreign_decl_line_number.m:19:2: error: #error Error in foreign decl
++foreign_decl_line_number.m:23:2: error: #error Error in foreign code
++foreign_decl_line_number.m:37:2: error: #error Error in foreign proc
 diff -urN mercury-tests-0.12.2.orig/mdbrc mercury-tests-0.12.2/mdbrc
 --- mercury-tests-0.12.2.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/mdbrc	2006-06-13 23:14:54.000000000 +1200
++++ mercury-tests-0.12.2/mdbrc	2006-08-13 21:25:10.000000000 +1200
 @@ -0,0 +1,19 @@
 +source MDB_DOC
 +alias	s	step
@@ -76,42 +83,42 @@ diff -urN mercury-tests-0.12.2.orig/mdbrc mercury-tests-0.12.2/mdbrc
 +set xml_tmp_filename ''
 diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck.exp5 mercury-tests-0.12.2/tabling/loopcheck.exp5
 --- mercury-tests-0.12.2.orig/tabling/loopcheck.exp5	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/loopcheck.exp5	2006-06-11 13:36:36.000000000 +1200
++++ mercury-tests-0.12.2/tabling/loopcheck.exp5	2006-08-13 21:25:10.000000000 +1200
 @@ -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.12.2.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2
 --- mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2	2006-06-11 13:38:18.000000000 +1200
++++ mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2	2006-08-13 21:25:10.000000000 +1200
 @@ -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.12.2.orig/tabling/tc_loop.exp3 mercury-tests-0.12.2/tabling/tc_loop.exp3
 --- mercury-tests-0.12.2.orig/tabling/tc_loop.exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_loop.exp3	2006-06-11 13:32:14.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_loop.exp3	2006-08-13 21:25:10.000000000 +1200
 @@ -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.12.2.orig/tabling/tc_memo.exp2 mercury-tests-0.12.2/tabling/tc_memo.exp2
 --- mercury-tests-0.12.2.orig/tabling/tc_memo.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_memo.exp2	2006-06-11 13:37:21.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_memo.exp2	2006-08-13 21:25:10.000000000 +1200
 @@ -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.12.2.orig/tabling/tc_memo2.exp2 mercury-tests-0.12.2/tabling/tc_memo2.exp2
 --- mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_memo2.exp2	2006-06-11 13:33:49.000000000 +1200
++++ mercury-tests-0.12.2/tabling/tc_memo2.exp2	2006-08-13 21:25:10.000000000 +1200
 @@ -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 -urN mercury-tests-0.12.2.orig/valid/Mmakefile mercury-tests-0.12.2/valid/Mmakefile
 --- mercury-tests-0.12.2.orig/valid/Mmakefile	2005-08-17 16:44:17.000000000 +1200
-+++ mercury-tests-0.12.2/valid/Mmakefile	2006-06-11 20:48:47.000000000 +1200
++++ mercury-tests-0.12.2/valid/Mmakefile	2006-08-13 21:25:10.000000000 +1200
 @@ -376,3 +376,5 @@
  	rm -f *.err *.h
  
diff --git a/dev-lang/mercury/mercury-0.12.2-r3.ebuild b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
index b6ac4732e83a..6f2e3d791f88 100644
--- a/dev-lang/mercury/mercury-0.12.2-r3.ebuild
+++ b/dev-lang/mercury/mercury-0.12.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.1 2006/08/12 01:42:13 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.12.2-r3.ebuild,v 1.2 2006/08/14 07:51:40 keri Exp $
 
 inherit eutils
 
@@ -71,14 +71,25 @@ src_compile() {
 }
 
 src_test() {
-	cd "${TESTDIR}"
+	cd "${S}"
+	TEST_GRADE=`scripts/ml --print-grade`
+	if [ -d "${S}"/libgrades/${TEST_GRADE} ] ; then
+		TWS="${S}"/libgrades/${TEST_GRADE}
+		cp browser/mer_browser.init "${TWS}"/browser/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+	else
+		TWS="${S}"
+	fi
 
-	PATH="${S}"/scripts:"${S}"/util:"${PATH}" \
-	WORKSPACE="${S}" \
-	MERCURY_COMPILER="${S}"/compiler/${PN}_compile \
-	MMAKE_DIR="${S}"/scripts \
+	cd "${TESTDIR}"
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \
+	WORKSPACE="${TWS}" \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
 	MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
-	mmake || die "mmake test failed"
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
 }
 
 src_install() {
@@ -89,5 +100,8 @@ src_install() {
 		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
 		install || die "make install failed"
 
-	dodoc BUGS HISTORY LIMITATIONS NEWS README README.Java README.Linux README.Linux-Alpha README.Linux-m68k README.Linux-PPC RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
 }