~ salmonella-environment-setup (master) 7656943173369cf52bf0097072e8013d0ef3eb56
commit 7656943173369cf52bf0097072e8013d0ef3eb56
Author: Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Wed Oct 27 20:03:35 2021 +0200
Commit: Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Wed Oct 27 20:05:31 2021 +0200
conf: skip fuse in C5 too
fuse tests can also hang in C5:
https://bugs.call-cc.org/ticket/1775
diff --git a/conf/common/chicken-4.scm b/conf/common/chicken-4.scm
index 7f4d7b9..745ac23 100644
--- a/conf/common/chicken-4.scm
+++ b/conf/common/chicken-4.scm
@@ -18,7 +18,6 @@
(skip-eggs
(append '(async-io
- fuse ;; https://bugs.call-cc.org/ticket/1775
pledge
spatial-trees)
(skip-eggs)))
diff --git a/conf/common/chicken-5.scm b/conf/common/chicken-5.scm
index 12c9fc4..0ca374b 100644
--- a/conf/common/chicken-5.scm
+++ b/conf/common/chicken-5.scm
@@ -20,10 +20,13 @@
(make-pathname (list (chicken-bootstrap-prefix) "bin")
"salmonella"))
-(case (software-version)
- ((openbsd) (skip-eggs '(inotify)))
- ((freebsd) (skip-eggs '(inotify pledge unveil)))
- ((linux) (skip-eggs '(pledge unveil))))
+(skip-eggs
+ (append
+ (case (software-version)
+ ((openbsd) '(inotify))
+ ((freebsd) '(inotify pledge unveil))
+ ((linux) '(pledge unveil)))
+ (skip-eggs)))
;;; Uncomment the lines below to quickly test the workflow (skip
;;; building CHICKEN and only test one egg)
diff --git a/conf/common/common.scm b/conf/common/common.scm
index 4b018c3..70434c3 100644
--- a/conf/common/common.scm
+++ b/conf/common/common.scm
@@ -18,6 +18,10 @@
"Environment variable is not set"
var))))
+(skip-eggs
+ (cons 'fuse ;; https://bugs.call-cc.org/ticket/1775
+ (skip-eggs)))
+
(keep-repo? #t)
(compress-report? #f)
Trap