[patch] swi-prolog-5.6.0-packages-test.patch

swi-prolog-5.6.0-packages-test.patch (text/plain), 8.50 KB, created by Keri Harris (RETIRED) on 2006-01-02 21:34:44 UTC

--- pl-5.6.0/packages/chr/chr_test.pl.orig	2005-12-02 21:53:04.000000000 +1300
+++ pl-5.6.0/packages/chr/chr_test.pl	2006-01-02 16:22:04.000000000 +1300
@@ -5,8 +5,8 @@
     Copyright (C) 1996 University of Amsterdam. All rights reserved.
 */
 
-%% :- asserta(user:file_search_path(chr, '.')).
-%% :- asserta(user:file_search_path(library, '.')).
+:- asserta(user:file_search_path(chr, '.')).
+:- asserta(user:file_search_path(library, '.')).
 :- use_module(library(chr)).
 %%  :- use_module(chr).			% == library(chr)
 
--- pl-5.6.0.orig/packages/clib/configure.in	2005-10-12 21:54:11.000000000 +1300
+++ pl-5.6.0/packages/clib/configure.in	2006-01-03 16:50:22.000000000 +1300
@@ -19,6 +19,7 @@
 AC_SUBST(TARGETS)
 AC_SUBST(PLTARGETS)
 AC_SUBST(CRYPTLIBS)
+AC_SUBST(MT)
 
 AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
 	      [ case "$enableval" in
--- pl-5.6.0.orig/packages/clib/Makefile.in	2005-07-25 02:37:56.000000000 +1200
+++ pl-5.6.0/packages/clib/Makefile.in	2006-01-03 16:56:44.000000000 +1300
@@ -41,6 +41,8 @@
 LD=@LD@
 LDFLAGS=@LDSOFLAGS@
 
+CHECK_THREADS=@MT@
+
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
@@ -123,7 +125,9 @@
 torture:	torture-socket
 
 check-socket::
-		$(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)'
+		@if test "$(CHECK_THREADS)" = "yes" ; then \
+		    $(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)' ; \
+		fi
 
 torture-socket::
 		$(PL) -q -f stresssocket.pl -F none -g test,halt -t 'halt(1)'
--- pl-5.6.0.orig/packages/semweb/configure.in	2005-01-31 23:47:37.000000000 +1300
+++ pl-5.6.0/packages/semweb/configure.in	2006-01-03 17:05:30.000000000 +1300
@@ -17,13 +17,16 @@
 AC_SUBST(SO)
 AC_SUBST(LDSOFLAGS)
 AC_SUBST(RUNTEX)
+AC_SUBST(ENABLE_CHECKS)
 
 AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
 	      [case "$enableval" in
 		   yes) AC_DEFINE([_REENTRANT], 1,
 				  [Define to prepare for multi-threading])
+			ENABLE_CHECKS="yes"
+			;;
+		   *)   ENABLE_CHECKS="no"
 			;;
-		   *)  ;;
 	       esac])
 
 if test -z "$PLINCL"; then
--- pl-5.6.0.orig/packages/semweb/Makefile.in	2005-07-05 21:08:27.000000000 +1200
+++ pl-5.6.0/packages/semweb/Makefile.in	2006-01-03 17:06:48.000000000 +1300
@@ -44,6 +44,8 @@
 LD=@LD@
 LDFLAGS=@LDSOFLAGS@
 
+ENABLE_CHECKS=@ENABLE_CHECKS@
+
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
@@ -127,7 +129,9 @@
 ################################################################
 
 check::
-		$(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)'
+		@if test "$(ENABLE_CHECKS)" = "yes" ; then \
+		    $(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)' ; \
+		fi
 
 
 ################################################################
Common subdirectories: pl-5.6.0.orig/packages/semweb/Tests and pl-5.6.0/packages/semweb/Tests
--- pl-5.6.0.orig/packages/ssl/configure.in	2005-10-12 03:04:27.000000000 +1300
+++ pl-5.6.0/packages/ssl/configure.in	2006-01-03 16:12:49.000000000 +1300
@@ -19,13 +19,16 @@
 AC_SUBST(TARGETS)
 AC_SUBST(PLTARGETS)
 AC_SUBST(RUNTEX)
+AC_SUBST(ENABLE_CHECKS)
 
 AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
 	      [case "$enableval" in
 		   yes) AC_DEFINE([_REENTRANT], 1,
 				  [Define to support threads])
+			ENABLE_CHECKS="yes"
+			;;
+		   *)	ENABLE_CHECKS="no"
 			;;
-		   *)  ;;
 	       esac])
 
 if test -z "$PLINCL"; then
--- pl-5.6.0.orig/packages/ssl/etc/config-req.txt	1970-01-01 12:00:00.000000000 +1200
+++ pl-5.6.0/packages/ssl/etc/config-req.txt	2006-01-03 10:11:21.000000000 +1300
@@ -0,0 +1,19 @@
+
+[ req ]
+default_bits           = 1024
+default_keyfile        = newreq.pem
+distinguished_name     = req_distinguished_name
+attributes             = req_attributes
+prompt                 = no
+output_password        = apenoot
+
+[ req_distinguished_name ]
+C                      = NL
+ST                     = Noord-Holland
+L                      = Amsterdam
+O                      = Diff Automatisering
+OU                     = Support group
+CN                     = J. van der Steen
+emailAddress           = [e-mail]
+
+[ req_attributes ]
--- pl-5.6.0.orig/packages/ssl/Makefile.in	2005-05-11 20:45:37.000000000 +1200
+++ pl-5.6.0/packages/ssl/Makefile.in	2006-01-03 16:11:28.000000000 +1300
@@ -42,6 +42,8 @@
 LD=@LD@
 LDFLAGS=@LDSOFLAGS@
 
+ENABLE_CHECKS=@ENABLE_CHECKS@
+
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
@@ -128,7 +130,16 @@
 ################################################################
 
 check::
-		$(PL) -q -f ssl_test.pl -F none -g test,halt -t 'halt(1)'
+		@if test $(ENABLE_CHECKS) == "yes" ; then \
+		    (cd etc && \
+		    cat /dev/null > demoCA/index.txt && \
+		    openssl req -new -x509 -keyout demoCA/private/cakey.pem -out demoCA/cacert.pem -passout pass:apenoot -days 1 -config config-req.txt && \
+		    openssl req -new -config server/config-req.txt -keyout server/server-key.pem -out server/server-key.pem && \
+		    openssl ca -batch -passin pass:apenoot -policy policy_anything -out server/server-cert.pem -infiles server/server-key.pem && \
+		    openssl req -new -config client/config-req.txt -keyout client/client-sign-key.pem -out client/client-sign-key.pem && \
+		    openssl ca -batch -passin pass:apenoot -policy policy_anything -out client/client-sign.pem -infiles client/client-sign-key.pem) ; \
+		    $(PL) -q -f ssl_test.pl -F none -g test,halt -t 'halt(1)' ; \
+		fi
 
 ################################################################
 # Clean
--- pl-5.6.0.orig/packages/xpce/src/Makefile.in	2005-12-23 01:28:11.000000000 +1300
+++ pl-5.6.0/packages/xpce/src/Makefile.in	2006-01-03 13:49:51.000000000 +1300
@@ -55,6 +55,7 @@
 DESTDIR=
 
 PCEHOME=@PCEHOME@
+PCEBUILD=$(PCEHOME)/src/xpce.sh
 XINCLUDES=@XINCLUDES@
 XLIB=@XLIB@
 
@@ -896,7 +897,7 @@
 ################################################################
 
 check::
-		$(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
+		$(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
 
 
 ################################################################
--- pl-5.6.0.orig/packages/xpce/src/test.pl	2005-11-03 04:10:22.000000000 +1300
+++ pl-5.6.0/packages/xpce/src/test.pl	2006-01-03 13:32:16.000000000 +1300
@@ -35,6 +35,10 @@
 	?- test.
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
+:- asserta(library_directory('../prolog/lib')).
+:- use_module(library(pce)).
+:- use_module(library(pce_util)).
+
 :- get(@pce, version, V),
    format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\
           To run all tests run ?- test.~n~n', [V]).
@@ -163,16 +167,17 @@
 		 *******************************/
 
 srcsink(contents-1) :-
-	numlist(32, 1000, L),
+	numlist(32, 255, L),
 	tmp_file(test, Tmp),
-	open(Tmp, write, Out, [encoding(utf8)]),
+	open(Tmp, write, Out, [encoding(iso_latin_1)]),
 	maplist(put_code(Out), L),
 	close(Out),
-	new(File, file(Tmp, utf8)),
+	new(File, file(Tmp, iso_latin_1)),
 	get(File, contents, String),
 	delete_file(Tmp),
 	get(String, value, Atom),
 	atom_codes(Atom, L).
+
 srcsink(read-1) :-
 	numlist(32, 1000, L),
 	tmp_file(test, Tmp),
@@ -191,9 +196,8 @@
 		 /*******************************
 		 *	       FILE		*
 		 *******************************/
-
 foreign(Name) :-
-	atom_codes(Name, [1087, 1083, 1072, 1090, 1085, 1072, 1103]).
+	atom_codes(Name, [102, 105, 108, 101, 110, 97, 109, 101]).
 
 file(env-1) :-
 	new(F, file('$PCEHOME/Defaults')),
@@ -202,11 +206,6 @@
 	get(F, name, PceName),
 	same_file(PceName, PlName),
 	send(F, same, PlName).
-file(home-1) :-
-	new(F, file('~/foobar')),
-	get(F, name, PceName),
-	expand_file_name('~/foobar', [PlName]),
-	same_file(PceName, PlName).
 file(abs-1) :-
 	new(F, file(foobar)),
 	get(F, absolute_path, Abs),
@@ -221,13 +220,15 @@
 	       ->  send(file(F), exists)
 	       ;   \+ send(file(F), exists)
 	       )).
-file(utf8-1) :-
+file(ascii-1) :-
 	foreign(Name),
 	new(F, file(Name)),
+	send(F, encoding, iso_latin_1),
 	send(F, open, write),
 	send(F, append, 'Hello world\n'),
 	send(F, close),
 	new(F2, file(Name)),
+	send(F2, encoding, iso_latin_1),
 	exists_file(Name),
 	send(F2, exists),
 	get(F2, contents, string('Hello world\n')),
@@ -312,12 +313,12 @@
 	atom_concat(hello, Wide, New).
 textbuffer(file-1) :-
 	new(TB, text_buffer),
-	numlist(32, 1000, L),
+	numlist(32, 255, L),
 	atom_codes(WAtom, L),
 	send(TB, append, WAtom),
 	tmp_file(test, Tmp),
-	send(TB, save, file(Tmp, utf8)),
-	get(file(Tmp, utf8), contents, string(Copy)),
+	send(TB, save, file(Tmp, iso_latin_1)),
+	get(file(Tmp, iso_latin_1), contents, string(Copy)),
 	delete_file(Tmp),
 	Copy == WAtom.
 textbuffer(store-1) :-