From b7ffe5ac14dcaa573f2f9d57b3fdfb6d8e636173 Mon Sep 17 00:00:00 2001
From: Sebastian Christ <rudolfo.christ@proton.me>
Date: Wed, 25 Mar 2026 16:04:52 +0100
Subject: [PATCH 1/2] Run test also on ecl

---
 .github/workflows/ci.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 77b8559..6cbdb35 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
+        lisp: [sbcl, ecl]
+        exclude:
+          - os: windows-latest
+            lisp: [ecl]
     defaults:
       run:
         shell: bash
@@ -33,25 +37,36 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install SBCL (Linux)
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && matrix.lisp == 'sbcl'
         run: sudo apt-get install -y sbcl
 
+      - name: Install ECL (Linux)
+        if: runner.os == 'Linux' && matrix.lisp == 'ecl'
+        run: sudo apt-get install -y ecl
+
       - name: Install SBCL (macOS)
-        if: runner.os == 'macOS'
+        if: runner.os == 'macOS' && matrix.lisp == 'sbcl'
         run: brew install sbcl
 
+      - name: Install ECL (macOS)
+        if: runner.os == 'macOS' && matrix.lisp == 'ecl'
+        run: brew install ecl
+
       - name: Install SBCL (Windows)
         if: runner.os == 'Windows'
         run: choco install sbcl
 
       - name: Install Quicklisp and ql-https
+        env:
+          LISP: ${{matrix.lisp}}
         run: ./install.sh
 
       - name: Run tests
         env:
           CI: 1
+          LISP: ${{matrix.lisp}}
         run: |
-          sbcl <<EOF
+          $LISP <<EOF
           (require 'asdf)
           (push (uiop:getcwd) asdf:*central-registry*)
           (ql:quickload "ql-https/test")

From 82184682203de6bf36559c1c630e1836203a7097 Mon Sep 17 00:00:00 2001
From: Sebastian Christ <rudolfo.christ@proton.me>
Date: Thu, 26 Mar 2026 15:34:42 +0100
Subject: [PATCH 2/2] Don't use sb-thread with ECL

---
 .github/workflows/ci.yml | 22 +++++++---------------
 install.sh               |  1 +
 t/tests.lisp             | 13 +++++++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cbdb35..d70b2da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         lisp: [sbcl, ecl]
         exclude:
           - os: windows-latest
-            lisp: [ecl]
+            lisp: ecl
     defaults:
       run:
         shell: bash
@@ -36,21 +36,13 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
 
-      - name: Install SBCL (Linux)
-        if: runner.os == 'Linux' && matrix.lisp == 'sbcl'
-        run: sudo apt-get install -y sbcl
+      - name: Install ${{ matrix.lisp }} (Linux)
+        if: runner.os == 'Linux'
+        run: sudo apt-get install -y ${{ matrix.lisp }}
 
-      - name: Install ECL (Linux)
-        if: runner.os == 'Linux' && matrix.lisp == 'ecl'
-        run: sudo apt-get install -y ecl
-
-      - name: Install SBCL (macOS)
-        if: runner.os == 'macOS' && matrix.lisp == 'sbcl'
-        run: brew install sbcl
-
-      - name: Install ECL (macOS)
-        if: runner.os == 'macOS' && matrix.lisp == 'ecl'
-        run: brew install ecl
+      - name: Install ${{ matrix.lisp }} (macOS)
+        if: runner.os == 'macOS'
+        run: brew install ${{ matrix.lisp }}
 
       - name: Install SBCL (Windows)
         if: runner.os == 'Windows'
diff --git a/install.sh b/install.sh
index f076999..52288fe 100755
--- a/install.sh
+++ b/install.sh
@@ -50,6 +50,7 @@ if test "$SKIP_USERINIT" = no; then
 (quicklisp:setup)
 (ql-util:without-prompting
   (ql:add-to-init-file))
+(uiop:quit)
 EOF
 
     cat > "$QL_TOPDIR"/setup.lisp <<EOF
diff --git a/t/tests.lisp b/t/tests.lisp
index 95d91b9..bcc8f9d 100644
--- a/t/tests.lisp
+++ b/t/tests.lisp
@@ -9,12 +9,25 @@
 
 (def-suite* :ql-https)
 
+#+(and sbcl sb-thread)
 (defmacro wait ((&key (timeout 20)) &body body)
   (let ((gthread (gensym "thread")))
     `(let ((,gthread (sb-thread:make-thread (lambda ()
                                               (progn ,@body)))))
        (sb-thread:join-thread ,gthread :timeout ,timeout))))
 
+#+ecl
+(defmacro wait ((&key (timeout 20)) &body body)
+  (decalre (ignore timeout))
+  (let ((gthread (gensym "thread")))
+    `(let ((,gthread (mp:process-run-function 'wait-thread (lambda () (progn ,@body)))))
+       (mp:process-join ,gthread))))
+
+#-(or sbcl ecl)
+(defmacro wait ((&key (timeout 20)) &body body)
+  (declare (ignore timeout))
+  `(progn ,@body))
+
 (test test-ql-https-is-initialized-correctly
   (let ((http-function (cdr (assoc "http" ql-http:*fetch-scheme-functions* :test #'string=)))
         (https-function (cdr (assoc "https" ql-http:*fetch-scheme-functions* :test #'string=))))