Commit760d093fRecorded31 Mar 2026Repositorysigil-ffi

Fix test suite: re-apply hang fix, remove extracted package tests, fix imports

Message

- Re-apply multi-package workspace fix (accidentally reverted in 5e65b1ab) that prevents test harness triggering for monorepo workspaces - Replace (scheme base) import with (sigil io) in sigil-http request.sgl since (scheme base) was extracted to standalone repo - Add missing (sigil http response) import in test-client.sgl - Update ffi-dlopen test to find zig at ~/.sigil/toolchain/zig/zig - Remove sigil-css package directory (fully extracted) - Remove test files for extracted packages: match, seq, fn, threading, r7rs, import-modifiers, sxml, prelude-r7rs, markdown

Changed
 test/test-ffi-dlopen.sgl | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
Diff
test/test-ffi-dlopen.sglmodified
@@ -23,10 +23,21 @@
23
(define test-lib-so (path-join test-dir "libffi-test.so"))
24
25
;; Compile the shared library before tests run.
26
;; Try cc first, fall back to gcc (Guix shells often only have gcc).
27
(let* ((compiler (if (= 0 (process-run "sh" "-c" "command -v cc >/dev/null 2>&1"))
28
"cc" "gcc"))
29
(rc (process-run compiler "-shared" "-fPIC" "-o" test-lib-so test-lib-src)))
+26
;; Try zig cc first (sigil toolchain or PATH), then cc, then gcc.
+27
(define sigil-zig (path-join (or (getenv "HOME") "") ".sigil" "toolchain" "zig" "zig"))
+28
+29
(define (find-c-compiler)
+30
(cond
+31
((file-exists? sigil-zig) sigil-zig)
+32
((= 0 (process-run "sh" "-c" "command -v zig >/dev/null 2>&1")) "zig")
+33
((= 0 (process-run "sh" "-c" "command -v cc >/dev/null 2>&1")) "cc")
+34
(else "gcc")))
+35
+36
(let* ((compiler (find-c-compiler))
+37
(use-zig? (string-contains? compiler "zig"))
+38
(rc (if use-zig?
+39
(process-run compiler "cc" "-shared" "-fPIC" "-o" test-lib-so test-lib-src)
+40
(process-run compiler "-shared" "-fPIC" "-o" test-lib-so test-lib-src))))
41
(unless (= rc 0)
42
(error "Failed to compile ffi-test-lib.c")))
43