From df1f0b738b2045d2690b52105b5ad24d474ff100 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Thu, 18 Aug 2022 09:07:22 -0500 Subject: user/guile{,20}: merge packages. force bootstrap on ppc. fixes #533, #691. --- ...with-owner-not-retained-threads-test-as-u.patch | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch (limited to 'user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch') diff --git a/user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch deleted file mode 100644 index cbe194dfd..000000000 --- a/user/guile20/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch +++ /dev/null @@ -1,29 +0,0 @@ -From be9d97e0eeb2423b86fad7094a462b142f5176f7 Mon Sep 17 00:00:00 2001 -From: Rob Browning -Date: Sun, 18 Mar 2012 13:28:24 -0500 -Subject: Mark "mutex with owner not retained" threads test as unresolved. - -As per discussion with upstream, mark this test as unresolved since it -may produce false negatives, depending on the behavior/timing of the -garbage collector. ---- - test-suite/tests/threads.test | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test -index 8178120..7d180de 100644 ---- a/test-suite/tests/threads.test -+++ b/test-suite/tests/threads.test -@@ -412,8 +412,10 @@ - - (gc) (gc) - (let ((m (g))) -- (and (mutex? m) -- (eq? (mutex-owner m) (current-thread))))))) -+ (or -+ (and (mutex? m) -+ (eq? (mutex-owner m) (current-thread))) -+ (throw 'unresolved)))))) - - ;; - ;; mutex lock levels -- cgit v1.2.3-60-g2f50