From 5d83e860ea62e3fb89adf982df0c03c81d2df1ea Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Tue, 29 Nov 2016 19:48:31 +0900 Subject: dev-scheme/gauche: fix tests Package-Manager: portage-2.3.0 --- dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch | 5 +++-- .../gauche/files/gauche-0.9.3.3-file.util.patch | 21 +++++++++++++++++++++ dev-scheme/gauche/gauche-0.9.3.3.ebuild | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch (limited to 'dev-scheme') diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch index 662ab433ef5f..0bce39ad9929 100644 --- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch +++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch @@ -1,11 +1,12 @@ --- Gauche-0.9.3.2.orig/ext/tls/Makefile.in +++ Gauche-0.9.3.2/ext/tls/Makefile.in -@@ -77,6 +77,8 @@ +@@ -77,6 +77,9 @@ @sed -e "s@\.\./ssl/@../../$(srcdir)/axTLS/ssl/@g" \ -e "s/system/safe_system/g" \ -e "s@openssl @sh ../../$(srcdir)/kick_openssl @g" \ + -e "/do_reneg = 1;/i#if 0" \ -+ -e "/do_reneg = 0;/a#endif" \ ++ -e "/do_reneg = 0;/a#endif" \ ++ -e "/SSL_server_test(/,/)/s/ -tls1//" \ $(srcdir)/axTLS/ssl/test/ssltest.c >> $(SSLTEST_GENERATED) @cat $(srcdir)/system-fix.c >> $(SSLTEST_GENERATED) diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch new file mode 100644 index 000000000000..1e4cd5d19521 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch @@ -0,0 +1,21 @@ +commit 15fb279dccb83d66d7e866a0e6f4e3f9ff64fd8d +Author: Shiro Kawai +Date: Thu Nov 29 23:17:55 2012 -1000 + + Fix file.util test + + The current test may fail when a size of a directory happens to + 100. Patch from NIIBE Yutaka. + +--- a/ext/file/test.scm ++++ b/ext/file/test.scm +@@ -290,7 +290,8 @@ + (reverse + (directory-fold "test.out" + (^[path result] +- (if (= (file-size path) 100) ++ (if (and (file-is-regular? path) ++ (= (file-size path) 100)) + (cons path result) + result)) + '() diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild index 675346cb330c..5ccedde24293 100644 --- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild +++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9-xz-info.patch "${FILESDIR}"/${PN}-0.9-rfc.tls.patch "${FILESDIR}"/${P}-gauche.threads.patch + "${FILESDIR}"/${P}-file.util.patch ) src_prepare() { -- cgit v1.2.3