Suppress zstream test on single-threaded engines.

(Portage version: 2.1.2-r10)

5 files changed, 90 insertions, 7 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index f1f9d3ed2b68..6dac77f807ff 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.61 2007/02/13 07:43:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.62 2007/02/23 20:22:20 keri Exp $
+
+  23 Feb 2007; keri <keri@gentoo.org>
+  +files/swi-prolog-thread-tests-r1.patch, swi-prolog-5.6.25.ebuild,
+  swi-prolog-5.6.27.ebuild, swi-prolog-5.6.28.ebuild:
+  Suppress zstream test on single-threaded engines.
 
   13 Feb 2007; keri <keri@gentoo.org> +files/swi-prolog-errno.patch,
   swi-prolog-5.6.28.ebuild:
diff --git a/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch
new file mode 100644
index 000000000000..88d6b0f7a484
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch
@@ -0,0 +1,78 @@
+diff -ur pl-5.6.25.orig/packages/clib/testsocket.pl pl-5.6.25/packages/clib/testsocket.pl
+--- pl-5.6.25.orig/packages/clib/testsocket.pl	2004-09-22 02:28:16.000000000 +1200
++++ pl-5.6.25/packages/clib/testsocket.pl	2007-02-24 08:55:29.000000000 +1300
+@@ -35,6 +35,12 @@
+ 	    client/1			% +Address
+ 	  ]).
+ 
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling tcp_test on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- asserta(user:file_search_path(foreign, '.')).
+ 
+ :- use_module(socket).
+diff -ur pl-5.6.25.orig/packages/semweb/litmap_test.pl pl-5.6.25/packages/semweb/litmap_test.pl
+--- pl-5.6.25.orig/packages/semweb/litmap_test.pl	2006-03-07 02:17:30.000000000 +1300
++++ pl-5.6.25/packages/semweb/litmap_test.pl	2007-02-24 08:55:29.000000000 +1300
+@@ -3,6 +3,13 @@
+ 	    test/1,
+ 	    test/2
+ 	  ]).
++
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling literal map test on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- use_module(library(debug)).
+ :- use_module(library(debug)).
+ :- asserta(user:file_search_path(foreign, '../sgml')).
+diff -ur pl-5.6.25.orig/packages/semweb/rdf_db_test.pl pl-5.6.25/packages/semweb/rdf_db_test.pl
+--- pl-5.6.25.orig/packages/semweb/rdf_db_test.pl	2006-11-10 22:44:56.000000000 +1300
++++ pl-5.6.25/packages/semweb/rdf_db_test.pl	2007-02-24 08:55:29.000000000 +1300
+@@ -29,6 +29,12 @@
+     the GNU General Public License.
+ */
+ 
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling RDF_DB test suite on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- asserta(file_search_path(foreign, '../sgml')).
+ :- asserta(file_search_path(library, '../sgml')).
+ :- asserta(file_search_path(library, '../sgml/RDF')).
+Only in pl-5.6.25/packages/semweb: rdf_db_test.pl.orig
+diff -ur pl-5.6.25.orig/packages/ssl/ssl_test.pl pl-5.6.25/packages/ssl/ssl_test.pl
+--- pl-5.6.25.orig/packages/ssl/ssl_test.pl	2006-06-21 19:51:59.000000000 +1200
++++ pl-5.6.25/packages/ssl/ssl_test.pl	2007-02-24 08:55:29.000000000 +1300
+@@ -29,6 +29,12 @@
+     the GNU General Public License.
+ */
+ 
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling SSL test on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- asserta(user:file_search_path(foreign, '.')).
+ 
+ :- use_module(ssl).
+diff -ur pl-5.6.25.orig/packages/zlib/ztest.pl pl-5.6.25/packages/zlib/ztest.pl
+--- pl-5.6.25.orig/packages/zlib/ztest.pl	2006-12-06 01:19:44.000000000 +1300
++++ pl-5.6.25/packages/zlib/ztest.pl	2007-02-24 09:05:57.000000000 +1300
+@@ -56,7 +56,7 @@
+ 
+ %	zstream: test compressed stream flushing and processing
+ 
+-test(zstream) :-
++test(zstream, [condition(current_prolog_flag(threads, true))]) :-
+ 	server(Port),
+ 	debug(server, 'Server at ~w~n', [Port]),
+ 	client(Port),
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
index 42db263dba5b..efe62da988b3 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.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/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.4 2007/02/03 03:28:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.5 2007/02/23 20:22:20 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -52,7 +52,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-semweb-bitmatrix.patch
 	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-ssl-SIO_FLUSHOUTPUT.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
+	epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
 	epatch "${FILESDIR}"/${PN}-zlib-test.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
index 3103326ed29c..35e776ceaf57 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.27.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/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.2 2007/02/03 03:28:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.3 2007/02/23 20:22:20 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -50,7 +50,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
 	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
+	epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
index 208302c026dc..30b611d3444a 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.28.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/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.2 2007/02/13 07:43:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.3 2007/02/23 20:22:20 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -51,7 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
 	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
+	epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
 }