From a4e2572e4ad09576eec8f18c787cb4cc402223de Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sat, 17 Aug 2019 16:55:25 +0200 Subject: [PATCH] Disable testpreempt on kfreebsd for now --- ...mpt-test-to-make-it-work-on-kfreebsd.patch | 21 ------------------- debian/patches/series | 1 - debian/rules | 8 +++++++ 3 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 debian/patches/0008-Tune-testpreempt-test-to-make-it-work-on-kfreebsd.patch diff --git a/debian/patches/0008-Tune-testpreempt-test-to-make-it-work-on-kfreebsd.patch b/debian/patches/0008-Tune-testpreempt-test-to-make-it-work-on-kfreebsd.patch deleted file mode 100644 index 247f6959..00000000 --- a/debian/patches/0008-Tune-testpreempt-test-to-make-it-work-on-kfreebsd.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stephane Glondu -Date: Mon, 29 Jul 2019 12:49:31 +0200 -Subject: Tune testpreempt test to make it work on kfreebsd - -Forwarded: https://github.com/ocaml/ocaml/pull/8849 ---- - testsuite/tests/lib-systhreads/testpreempt.ml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testsuite/tests/lib-systhreads/testpreempt.ml b/testsuite/tests/lib-systhreads/testpreempt.ml -index 11d6915..f4ef378 100644 ---- a/testsuite/tests/lib-systhreads/testpreempt.ml -+++ b/testsuite/tests/lib-systhreads/testpreempt.ml -@@ -19,6 +19,7 @@ let rec generate_list n = - aux [] n - - let rec long_computation time0 = -+ Thread.delay 0.1; - let long_list = generate_list 100000 in - let res = List.length (List.rev_map sin long_list) in - if Sys.time () -. time0 > 2. then diff --git a/debian/patches/series b/debian/patches/series index 3307b908..d1b447e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch 0006-Add-support-for-Debian-s-armhf-in-configure.ac.patch 0007-Fix-spelling-errors-reported-by-Lintian.patch -0008-Tune-testpreempt-test-to-make-it-work-on-kfreebsd.patch diff --git a/debian/rules b/debian/rules index 8d383502..f97d1cb8 100755 --- a/debian/rules +++ b/debian/rules @@ -267,6 +267,14 @@ ifneq (,$(filter $(DEB_BUILD_ARCH),$(SLOW_ARCHITECTURES))) sed -i /almabench.ml/d testsuite/tests/misc-unsafe/ocamltests rm -f testsuite/tests/misc-unsafe/almabench.ml endif +ifeq ($(OCAMLMAJOR),4.08) +ifneq (,$(findstring kfreebsd,$(DEB_BUILD_ARCH))) +# We temporarily disable testpreempt test which should be fixed in 4.09 +# See https://github.com/ocaml/ocaml/pull/8849 + sed -i /testpreempt.ml/d testsuite/tests/lib-systhreads/ocamltests + rm -f testsuite/tests/lib-systhreads/testpreempt.ml +endif +endif ifeq (,$(DEB_TEST_BUILD_PREFIX)) cd testsuite && make all endif -- 2.30.2