diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-02-15 18:30:25 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-02-15 18:30:25 +0000 |
| commit | 41e9f9f69e7da467d3ab458d17f0dd9a3b8f3f90 (patch) | |
| tree | 6ee9e9a3dd290b89e6fd38245903d9125c7b466e /dev-lang/mercury | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-41e9f9f69e7da467d3ab458d17f0dd9a3b8f3f90.tar.gz gentoo-2-41e9f9f69e7da467d3ab458d17f0dd9a3b8f3f90.tar.bz2 gentoo-2-41e9f9f69e7da467d3ab458d17f0dd9a3b8f3f90.zip | |
Disable dir_test testsuite in sandbox
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch | 53 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-10.04_beta1.ebuild | 3 |
3 files changed, 60 insertions, 2 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 1e11fa549fa6..62ff00c49660 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.98 2010/02/15 06:21:01 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.99 2010/02/15 18:30:25 keri Exp $ + + 15 Feb 2010; <keri@gentoo.org> mercury-10.04_beta1.ebuild, + +files/mercury-10.04_beta1-tests-sandbox.patch: + Disable dir_test testsuite in sandbox 15 Feb 2010; <keri@gentoo.org> mercury-10.04_beta1.ebuild, +files/mercury-10.04_beta1-atomic-ops.patch, diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch new file mode 100644 index 000000000000..d5bf0deffd45 --- /dev/null +++ b/dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch @@ -0,0 +1,53 @@ +diff -urN mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp mercury-tests-10.04-beta/hard_coded/dir_test.exp +--- mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp 2007-09-21 15:21:35.000000000 +1200 ++++ mercury-tests-10.04-beta/hard_coded/dir_test.exp 2010-02-15 20:13:25.000000000 +1300 +@@ -130,7 +130,6 @@ + "foo"/"bar/baz" = "foo\bar\baz".
+ "foo/"/"bar/baz" = "foo\bar\baz".
+ checking whether `unwritable' is readable...ok
+-unwritable file found to be unwritable
+ current_directory succeeded: hard_coded
+ make_directory succeeded
+ make_directory succeeded
+diff -u mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp2 mercury-tests-10.04-beta/hard_coded/dir_test.exp2 +--- mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp2 2007-10-01 18:40:43.000000000 +1300 ++++ mercury-tests-10.04-beta/hard_coded/dir_test.exp2 2010-02-15 19:38:42.000000000 +1300 +@@ -127,7 +127,6 @@ + "foo"/"bar/baz" = "foo/bar/baz". + "foo/"/"bar/baz" = "foo/bar/baz". + checking whether `unwritable' is readable...ok +-unwritable file found to be unwritable + current_directory succeeded: hard_coded + make_directory succeeded + make_directory succeeded +diff -u mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp3 mercury-tests-10.04-beta/hard_coded/dir_test.exp3 +--- mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp3 2007-10-01 18:40:43.000000000 +1300 ++++ mercury-tests-10.04-beta/hard_coded/dir_test.exp3 2010-02-15 19:38:57.000000000 +1300 +@@ -130,7 +130,6 @@ + "foo"/"bar/baz" = "foo/bar/baz". + "foo/"/"bar/baz" = "foo/bar/baz". + checking whether `unwritable' is readable...ok +-unwritable file found to be unwritable + current_directory succeeded: hard_coded + make_directory succeeded + make_directory succeeded +diff -u mercury-tests-10.04-beta.orig/hard_coded/dir_test.m mercury-tests-10.04-beta/hard_coded/dir_test.m +--- mercury-tests-10.04-beta.orig/hard_coded/dir_test.m 2007-09-21 15:21:36.000000000 +1200 ++++ mercury-tests-10.04-beta/hard_coded/dir_test.m 2010-02-15 19:39:25.000000000 +1300 +@@ -50,16 +50,6 @@ + io__write(ReadResult), + io__nl, + +- io__check_file_accessibility("unwritable", +- [read, write], WriteResult), +- ( { WriteResult = ok } -> +- io__write_string( +- "Error: unwritable file found to be writable\n") +- ; +- io__write_string( +- "unwritable file found to be unwritable\n") +- ), +- + dir__current_directory(CwdResult), + ( + { CwdResult = ok(Cwd) }, diff --git a/dev-lang/mercury/mercury-10.04_beta1.ebuild b/dev-lang/mercury/mercury-10.04_beta1.ebuild index bfb37a39e6a0..5bfb33809297 100644 --- a/dev-lang/mercury/mercury-10.04_beta1.ebuild +++ b/dev-lang/mercury/mercury-10.04_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04_beta1.ebuild,v 1.3 2010/02/15 06:21:01 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04_beta1.ebuild,v 1.4 2010/02/15 18:30:25 keri Exp $ inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib @@ -47,6 +47,7 @@ src_unpack() { if use test; then epatch "${FILESDIR}"/${P}-tests-workspace.patch epatch "${FILESDIR}"/${P}-tests-subdir.patch + epatch "${FILESDIR}"/${P}-tests-sandbox.patch fi } |