pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ocaml Apply a workaround for NetBSD to the testyi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ba57096c5c3
branches:  trunk
changeset: 443180:9ba57096c5c3
user:      he <he%pkgsrc.org@localhost>
date:      Tue Dec 08 08:53:16 2020 +0000

description:
Apply a workaround for NetBSD to the testyield.ml test.

On NetBSD, the "thread scheduler" appears to just schedule two
threads out of 4 when all they in essence to is "yield", and not
do round-robin scheduling, causing the test to loop.  Reduce the
number of threads in the test to 2.

Bump PKGREVISION.

OK'ed by jaapb@

diffstat:

 lang/ocaml/Makefile                                                  |   4 +-
 lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml |  19 ++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 0faa2cd05df5 -r 9ba57096c5c3 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Tue Dec 08 07:15:08 2020 +0000
+++ b/lang/ocaml/Makefile       Tue Dec 08 08:53:16 2020 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.136 2020/12/01 23:44:00 he Exp $
+# $NetBSD: Makefile,v 1.137 2020/12/08 08:53:16 he Exp $
 
 .include "Makefile.common"
 
 #CONFIGURE_ENV+=               disable_x11=yes
 
+PKGREVISION=           1
+
 BUILD_TARGET=          world
 MAKE_JOBS_SAFE=                no
 UNLIMIT_RESOURCES=     stacksize
diff -r 0faa2cd05df5 -r 9ba57096c5c3 lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml      Tue Dec 08 08:53:16 2020 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-testsuite_tests_lib-systhreads_testyield.ml,v 1.1 2020/12/08 08:53:16 he Exp $
+
+Reduce the number of threads to 2, so that we don't loop forever
+on NetBSD, where the scheduler appears to only alternate between
+two threads instead of doing round-robin scheduling.
+
+Ref. https://github.com/ocaml/ocaml/issues/10067
+
+--- testsuite/tests/lib-systhreads/testyield.ml.orig   2020-03-18 15:02:03.000000000 +0000
++++ testsuite/tests/lib-systhreads/testyield.ml
+@@ -7,7 +7,7 @@
+    ** native
+ *)
+ 
+-let threads = 4
++let threads = 2
+ 
+ let are_ready = ref 0
+ 



Home | Main Index | Thread Index | Old Index