Handle workspace flags when running against the Mercury test-suite.

Package-Manager: portage-2.1.2_rc4-r2

4 files changed, 41 insertions, 10 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index fbce247c56b8..730845804150 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # 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.73 2007/01/09 08:59:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.74 2007/01/11 08:54:43 keri Exp $
+
+  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.
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index a43b3c851029..2b394fe77ce9 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -174,6 +174,10 @@ AUX mercury-0.13.1-tests-tabling_inf_recursion.patch 2168 RMD160 1919748108d18fa
 MD5 0e1da35da5f7b4dcb87918610ec1d20a files/mercury-0.13.1-tests-tabling_inf_recursion.patch 2168
 RMD160 1919748108d18fad44397b89cfc4ff907f107e4a files/mercury-0.13.1-tests-tabling_inf_recursion.patch 2168
 SHA256 0108744a7161f03e2c00d923876b93f38bf45cfe8e94b7a2a53ead5b425a32cb files/mercury-0.13.1-tests-tabling_inf_recursion.patch 2168
+AUX mercury-0.13.1-tests-workspace.patch 463 RMD160 0181cdde5db4d42cd7c0be8ba3a17759eeba0c2b SHA1 e508f11c9359588113753759edb2f98771206800 SHA256 aa0225463e4b1c2ac4336c1d1daad049251396ed8a6430fb7016e0ee9000f8f0
+MD5 76c49d305c7152d7c746e0054215e90a files/mercury-0.13.1-tests-workspace.patch 463
+RMD160 0181cdde5db4d42cd7c0be8ba3a17759eeba0c2b files/mercury-0.13.1-tests-workspace.patch 463
+SHA256 aa0225463e4b1c2ac4336c1d1daad049251396ed8a6430fb7016e0ee9000f8f0 files/mercury-0.13.1-tests-workspace.patch 463
 AUX mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a SHA1 526488bac46ee66e0e446690054f20d44cd207af SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647
 MD5 8f12e666c9f377c1af363f9af1d1a0c8 files/mercury-0.13.1-tests.patch 15074
 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a files/mercury-0.13.1-tests.patch 15074
@@ -196,18 +200,18 @@ EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f4
 MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a mercury-0.13.0.ebuild 3399
-EBUILD mercury-0.13.1-r1.ebuild 3624 RMD160 7ca47771391c927fa06cffe073b77e827b33afc1 SHA1 a9f21f6c99c6e74a72ade69684d0054a63550988 SHA256 1ab5fabdedd87e7d4f97d64f8d5fcb112c8d85b10ec4f8fe23adaf6de0427926
-MD5 52d0c1550c649ed3d5e892acfce4aa37 mercury-0.13.1-r1.ebuild 3624
-RMD160 7ca47771391c927fa06cffe073b77e827b33afc1 mercury-0.13.1-r1.ebuild 3624
-SHA256 1ab5fabdedd87e7d4f97d64f8d5fcb112c8d85b10ec4f8fe23adaf6de0427926 mercury-0.13.1-r1.ebuild 3624
+EBUILD mercury-0.13.1-r1.ebuild 3926 RMD160 a5afa99059e0d5b168d0efd7f7acacb34c5c4338 SHA1 7968e83a285270cc0efc88fd3faab307d3be2e97 SHA256 3613e3408b7446ebd63ea7888d6f84c55c53e9f95c13f067a1cf87b7b0e85eb5
+MD5 0a42ff0b7047f827109f4f601a8f72e7 mercury-0.13.1-r1.ebuild 3926
+RMD160 a5afa99059e0d5b168d0efd7f7acacb34c5c4338 mercury-0.13.1-r1.ebuild 3926
+SHA256 3613e3408b7446ebd63ea7888d6f84c55c53e9f95c13f067a1cf87b7b0e85eb5 mercury-0.13.1-r1.ebuild 3926
 EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab SHA1 d8a9456db6ba4bfa5ece3334ffcda96c2dc4e5c5 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f
 MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346
 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346
 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346
-MISC ChangeLog 14218 RMD160 8267dfb6f273535272c95022e4eb8135b6d0a4e3 SHA1 34396e69b69a7838d520f51e40abf1fa2dfc45dc SHA256 43bf0607f46b2be0bce0f747fcc79fcd74eaa8431090bf18a3052267446469a5
-MD5 b6827fd5f9a7f33561f29810aa00c104 ChangeLog 14218
-RMD160 8267dfb6f273535272c95022e4eb8135b6d0a4e3 ChangeLog 14218
-SHA256 43bf0607f46b2be0bce0f747fcc79fcd74eaa8431090bf18a3052267446469a5 ChangeLog 14218
+MISC ChangeLog 14400 RMD160 14b26de9a41c20ff2ee87d7fa158d5fbdebab543 SHA1 c4789b4a167c0c56a0234c040fa84dcbcf1d0e30 SHA256 9840ba3ae860101fe38f10ac1cfb5c447b98c1575d862d541bda2065babe6c34
+MD5 bc5d3479d9c9aca01e82e8dd28701ede ChangeLog 14400
+RMD160 14b26de9a41c20ff2ee87d7fa158d5fbdebab543 ChangeLog 14400
+SHA256 9840ba3ae860101fe38f10ac1cfb5c447b98c1575d862d541bda2065babe6c34 ChangeLog 14400
 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.13.1-tests-workspace.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
new file mode 100644
index 000000000000..7897d3f0ec7c
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
@@ -0,0 +1,13 @@
+--- mercury-tests-0.13.1.orig/Mmake.common	2006-01-25 20:03:44.000000000 +1300
++++ mercury-tests-0.13.1/Mmake.common	2007-01-11 21:36:31.000000000 +1300
+@@ -73,8 +73,8 @@
+ -include $(TESTS_DIR)/Mmake.params
+ 
+ MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
+-ifdef WORKSPACE_FLAGS
+-MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
++ifdef WORKSPACE
++MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
+ endif
+ 
+ # Avoid trying to make this file with `mmc --make' if it doesn't exist.
diff --git a/dev-lang/mercury/mercury-0.13.1-r1.ebuild b/dev-lang/mercury/mercury-0.13.1-r1.ebuild
index 30aed09a2026..8b1c0037fb72 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.5 2007/01/09 08:59:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.1-r1.ebuild,v 1.6 2007/01/11 08:54:43 keri Exp $
 
 inherit eutils
 
@@ -39,6 +39,7 @@ src_unpack() {
 	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
 }
 
@@ -99,12 +100,21 @@ src_test() {
 	fi
 
 	cd "${TESTDIR}"
+	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
+
 	PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \
 	WORKSPACE="${TWS}" \
 	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
 	MMAKE_DIR="${TWS}"/scripts \
 	MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
 	GRADE=${TEST_GRADE} \
+	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
+					-I${TWS}/boehm_gc/include \
+					-I${TWS}/runtime \
+					-I${TWS}/library \
+					-I${TWS}/mdbcomp \
+					-I${TWS}/browser \
+					-I${TWS}/trace" \
 		mmake || die "mmake test failed"
 }