From 483f1b196532988ef9e91e2f040acbf8365fd116 Mon Sep 17 00:00:00 2001
From: Da Shen <da@liii.pro>
Date: Mon, 1 Jun 2026 11:51:43 +0800
Subject: [PATCH] =?UTF-8?q?[0059]=20=E4=BF=AE=E5=A4=8D=20liii=5Fsubprocess?=
 =?UTF-8?q?=20=E7=9A=84=20Windows=20=E5=85=BC=E5=AE=B9=E6=80=A7=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Windows=20=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Windows 下字符串命令使用 tb_process_init_cmd 而非 /bin/sh -c
- Windows 下 discard 模式使用 NUL 替代 /dev/null
- 为所有 subprocess 函数添加 (when (os-windows?) ...) 测试分支
- 命令行统一采用 python3
---
 src/liii_subprocess.cpp                       | 12 +++
 tests/liii/subprocess-test.scm                | 47 ++++++++++++
 tests/liii/subprocess/run-allow-bang-test.scm | 19 +++++
 tests/liii/subprocess/run-and-test.scm        | 28 +++++++
 tests/liii/subprocess/run-ban-bang-test.scm   | 17 +++++
 tests/liii/subprocess/run-either-test.scm     | 57 ++++++++++++++
 tests/liii/subprocess/run-get-test.scm        |  9 +++
 tests/liii/subprocess/run-if-test.scm         | 10 +++
 tests/liii/subprocess/run-or-test.scm         | 11 +++
 tests/liii/subprocess/run-pipe-test.scm       |  9 +++
 tests/liii/subprocess/run-sequence-test.scm   | 11 +++
 tests/liii/subprocess/run-set-bang-test.scm   | 11 +++
 tests/liii/subprocess/run-test.scm            | 22 ++++++
 tests/liii/subprocess/run-values-test.scm     | 74 ++++++++++++++++++-
 tests/liii/subprocess/run-when-test.scm       | 10 +++
 15 files changed, 346 insertions(+), 1 deletion(-)

diff --git a/src/liii_subprocess.cpp b/src/liii_subprocess.cpp
index 387f3dac..aa2d77a1 100644
--- a/src/liii_subprocess.cpp
+++ b/src/liii_subprocess.cpp
@@ -183,7 +183,11 @@ f_subprocess_run_values (s7_scheme* sc, s7_pointer args) {
   }
   else if (stdout_mode == redirect_mode::discard) {
     attr.outtype = TB_PROCESS_REDIRECT_TYPE_FILEPATH;
+#ifdef TB_CONFIG_OS_WINDOWS
+    attr.out.path = "NUL";
+#else
     attr.out.path = "/dev/null";
+#endif
     attr.outmode = TB_FILE_MODE_RW | TB_FILE_MODE_CREAT | TB_FILE_MODE_TRUNC;
   }
   else if (need_stdout_pipe) {
@@ -201,7 +205,11 @@ f_subprocess_run_values (s7_scheme* sc, s7_pointer args) {
   }
   else if (stderr_mode == redirect_mode::discard) {
     attr.errtype = TB_PROCESS_REDIRECT_TYPE_FILEPATH;
+#ifdef TB_CONFIG_OS_WINDOWS
+    attr.err.path = "NUL";
+#else
     attr.err.path = "/dev/null";
+#endif
     attr.errmode = TB_FILE_MODE_RW | TB_FILE_MODE_CREAT | TB_FILE_MODE_TRUNC;
   }
   else if (stderr_to_stdout && out_pipe[1]) {
@@ -240,8 +248,12 @@ f_subprocess_run_values (s7_scheme* sc, s7_pointer args) {
   tb_process_ref_t process = tb_null;
   if (s7_is_string (cmd_arg)) {
     const char* cmd_c = s7_string (cmd_arg);
+#ifdef TB_CONFIG_OS_WINDOWS
+    process = tb_process_init_cmd (cmd_c, &attr);
+#else
     tb_char_t const* sh_argv[] = {"sh", "-c", cmd_c, tb_null};
     process = tb_process_init ("/bin/sh", sh_argv, &attr);
+#endif
   }
   else if (s7_is_pair (cmd_arg)) {
     vector<const char*> argv;
diff --git a/tests/liii/subprocess-test.scm b/tests/liii/subprocess-test.scm
index abaa3e0d..5d52e4a7 100644
--- a/tests/liii/subprocess-test.scm
+++ b/tests/liii/subprocess-test.scm
@@ -57,4 +57,51 @@
   (check-catch 'value-error (run '(echo-cmd "hello")))
 ) ;when
 
+(when (os-windows?)
+  ;; run basic tests
+  (check (zero? (run "python3 -c pass")) => #t)
+  (check (zero? (run "python3 -c 1/0")) => #f)
+  (check (run "python3 -c print('hello')") => 0)
+
+  (let ((orig-dir (getcwd)))
+    (run "python3 -c pass" :cwd (os-temp-dir))
+    (check (getcwd) => orig-dir)
+  ) ;let
+
+  (check-catch 'value-error (run "cd /tmp" :cwd (os-temp-dir)))
+  (check-catch 'value-error (run '(cd "/tmp") :cwd (os-temp-dir)))
+
+  ;; run-set! / run-get tests
+  (run-set! 'pytrue "python3")
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+
+  (run-set! 'py-lambda (lambda () (display "ok\n")))
+  (check (zero? (run '(py-lambda))) => #t)
+
+  (check (path? (run-get 'pytrue)) => #t)
+  (check (run-get 'not-exist) => #f)
+
+  (run-set! 'custom-lambda (lambda () (display "ok\n")))
+  (check (procedure? (run-get 'custom-lambda)) => #t)
+
+  ;; run-allow! tests
+  (run-allow! 'pytrue)
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+  (check-catch 'value-error (run '(py-lambda)))
+
+  (run-allow! '())
+  (check (zero? (run '(py-lambda))) => #t)
+
+  (run-allow! '(pytrue py-lambda))
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+  (check (zero? (run '(py-lambda))) => #t)
+  (check-catch 'value-error (run '(unknown-cmd)))
+
+  (run-allow! '())
+
+  ;; run-ban! tests
+  (run-ban! 'pytrue)
+  (check-catch 'value-error (run '(pytrue "-c" "pass")))
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-allow-bang-test.scm b/tests/liii/subprocess/run-allow-bang-test.scm
index f0fca850..b5e7e149 100644
--- a/tests/liii/subprocess/run-allow-bang-test.scm
+++ b/tests/liii/subprocess/run-allow-bang-test.scm
@@ -32,4 +32,23 @@
   (run-allow! '())
 )
 
+(when (os-windows?)
+  (run-set! 'pytrue "python3")
+  (run-set! 'pyfalse "python3")
+
+  (run-allow! 'pytrue)
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+  (check-catch 'value-error (run '(pyfalse "-c" "1/0")))
+
+  (run-allow! '())
+  (check (zero? (run '(pyfalse "-c" "1/0"))) => #f)
+
+  (run-allow! '(pytrue pyfalse))
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+  (check (zero? (run '(pyfalse "-c" "1/0"))) => #f)
+  (check-catch 'value-error (run '(unknown-cmd)))
+
+  (run-allow! '())
+)
+
 (check-report)
diff --git a/tests/liii/subprocess/run-and-test.scm b/tests/liii/subprocess/run-and-test.scm
index a0b19015..3b647bad 100644
--- a/tests/liii/subprocess/run-and-test.scm
+++ b/tests/liii/subprocess/run-and-test.scm
@@ -68,4 +68,32 @@
   (check (to-left (run-and "true" "false" "true")) => '(1 "false"))
 ) ;when
 
+(when (os-windows?)
+  (check (either-right? (run-and "python3 -c pass" "python3 -c pass")) => #t)
+  (check (to-right (run-and "python3 -c pass" "python3 -c pass")) => 0)
+  (check (either-left? (run-and "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-left (run-and "python3 -c 1/0" "python3 -c pass")) => '(1 "python3 -c 1/0"))
+  (check (either-left? (run-and "python3 -c pass" "python3 -c 1/0")) => #t)
+  (check (to-left (run-and "python3 -c pass" "python3 -c 1/0")) => '(1 "python3 -c 1/0"))
+  (check (either-right? (run-and "python3 -c pass" "python3 -c pass" :cwd (os-temp-dir))) => #t)
+  (check (to-right (run-and "python3 -c pass" "python3 -c pass" :cwd (os-temp-dir))) => 0)
+  (let ((path-env (getenv "PATH")))
+    (check (either-right? (run-and "python3 -c pass" :env `(("FOO" . "bar") ("PATH" . ,path-env)))) => #t)
+    (check (to-right (run-and "python3 -c pass" :env `(("FOO" . "bar") ("PATH" . ,path-env)))) => 0))
+
+  ;; :stdout only on last
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-and-stdout-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-right? (run-and "python3 -c pass" "python3 -c pass" :stdout tmpfile)) => #t)
+    (check (to-right (run-and "python3 -c pass" "python3 -c pass" :stdout tmpfile)) => 0)
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; Multiple commands
+  (check (either-right? (run-and "python3 -c pass" "python3 -c pass" "python3 -c pass")) => #t)
+  (check (to-right (run-and "python3 -c pass" "python3 -c pass" "python3 -c pass")) => 0)
+  (check (either-left? (run-and "python3 -c pass" "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-left (run-and "python3 -c pass" "python3 -c 1/0" "python3 -c pass")) => '(1 "python3 -c 1/0"))
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-ban-bang-test.scm b/tests/liii/subprocess/run-ban-bang-test.scm
index fb336462..5a66af26 100644
--- a/tests/liii/subprocess/run-ban-bang-test.scm
+++ b/tests/liii/subprocess/run-ban-bang-test.scm
@@ -36,4 +36,21 @@
   (check (zero? (run "true")) => #t)
 ) ;when
 
+(when (os-windows?)
+  ;; 符号命令禁止与取消
+  (run-set! 'pytrue "python3")
+  (run-ban! 'pytrue)
+  (check-catch 'value-error (run '(pytrue "-c" "pass")))
+
+  (run-unban! 'pytrue)
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+
+  ;; 'rm 默认被禁止（字符串形式）
+  (check-catch 'value-error (run "rm -rf /tmp/test"))
+  (check-catch 'value-error (run "rm"))
+
+  ;; 其他命令不受影响
+  (check (zero? (run "python3 -c pass")) => #t)
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-either-test.scm b/tests/liii/subprocess/run-either-test.scm
index a7ccb8c1..6e38a978 100644
--- a/tests/liii/subprocess/run-either-test.scm
+++ b/tests/liii/subprocess/run-either-test.scm
@@ -98,4 +98,61 @@
   (check (to-right (run-either '(printf "%s" "hello world") :stdout 'capture)) => "hello world")
 ) ;when
 
+(when (os-windows?)
+  ;; basic success
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-either-out-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-right? (run-either "python3 -c pass" :stdout tmpfile :stderr 'discard)) => #t)
+    (check (to-right (run-either "python3 -c pass" :stdout tmpfile :stderr 'discard)) => "")
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; basic failure
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-either-out2-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-left? (run-either "python3 -c 1/0" :stdout tmpfile :stderr 'discard)) => #t)
+    (let ((result (to-left (run-either "python3 -c 1/0" :stdout tmpfile :stderr 'discard))))
+      (check (number? (car result)) => #t)
+      (check (string? (cdr result)) => #t))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; :cwd
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-either-cwd-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-right? (run-either "python3 -c pass" :cwd (os-temp-dir) :stdout tmpfile :stderr 'discard)) => #t)
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; :env
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-either-env-win.txt"))
+        (path-env (getenv "PATH")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-right? (run-either "python3 -c pass" :env `(("FOO" . "bar") ("PATH" . ,path-env)) :stdout tmpfile :stderr 'discard)) => #t)
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; :stdout to file
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-either-file-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-right? (run-either "python3 -c print('hello')" :stdout tmpfile :stderr 'discard)) => #t)
+    (check (to-right (run-either "python3 -c print('hello')" :stdout tmpfile :stderr 'discard)) => "")
+    (check (path-read-text tmpfile) => "hello\n")
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; :stdout 'discard
+  (check (either-right? (run-either "python3 -c pass" :stdout 'discard :stderr 'discard)) => #t)
+  (check (to-right (run-either "python3 -c pass" :stdout 'discard :stderr 'discard)) => "")
+
+  ;; list form with symbol head
+  (run-set! 'pypass "python3")
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-either-list-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (check (either-right? (run-either '(pypass "-c" "print('hello world')") :stdout tmpfile :stderr 'discard)) => #t)
+    (check (to-right (run-either '(pypass "-c" "print('hello world')") :stdout tmpfile :stderr 'discard)) => "")
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-get-test.scm b/tests/liii/subprocess/run-get-test.scm
index 0dfdb753..2d274c22 100644
--- a/tests/liii/subprocess/run-get-test.scm
+++ b/tests/liii/subprocess/run-get-test.scm
@@ -25,4 +25,13 @@
   (check (procedure? (run-get 'custom-lambda)) => #t)
 )
 
+(when (os-windows?)
+  (run-set! 'pytrue "python3")
+  (check (path? (run-get 'pytrue)) => #t)
+  (check (run-get 'not-exist) => #f)
+
+  (run-set! 'custom-lambda (lambda () (display "ok\n")))
+  (check (procedure? (run-get 'custom-lambda)) => #t)
+)
+
 (check-report)
diff --git a/tests/liii/subprocess/run-if-test.scm b/tests/liii/subprocess/run-if-test.scm
index 35557303..c8a832ce 100644
--- a/tests/liii/subprocess/run-if-test.scm
+++ b/tests/liii/subprocess/run-if-test.scm
@@ -29,4 +29,14 @@
   (check (to-left (run-if "false" "echo yes" "false")) => '(1 "false"))
 ) ;when
 
+(when (os-windows?)
+  (check (either-right? (run-if "python3 -c 1/0" "python3 -c pass" "python3 -c pass")) => #t)
+  (check (to-right (run-if "python3 -c 1/0" "python3 -c pass" "python3 -c pass")) => 0)
+
+  (check (either-left? (run-if "python3 -c pass" "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-left (run-if "python3 -c pass" "python3 -c 1/0" "python3 -c pass")) => '(1 "python3 -c 1/0"))
+  (check (either-left? (run-if "python3 -c 1/0" "python3 -c pass" "python3 -c 1/0")) => #t)
+  (check (to-left (run-if "python3 -c 1/0" "python3 -c pass" "python3 -c 1/0")) => '(1 "python3 -c 1/0"))
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-or-test.scm b/tests/liii/subprocess/run-or-test.scm
index 65d2981b..e3d3b0c6 100644
--- a/tests/liii/subprocess/run-or-test.scm
+++ b/tests/liii/subprocess/run-or-test.scm
@@ -31,4 +31,15 @@
   (check (to-right (run-or "true" "false" :cwd "/tmp")) => 0)
 ) ;when
 
+(when (os-windows?)
+  (check (either-right? (run-or "python3 -c pass" "python3 -c 1/0")) => #t)
+  (check (to-right (run-or "python3 -c pass" "python3 -c 1/0")) => 0)
+  (check (either-left? (run-or "python3 -c 1/0" "python3 -c 1/0")) => #t)
+  (check (to-left (run-or "python3 -c 1/0" "python3 -c 1/0")) => '(1 "python3 -c 1/0"))
+  (check (either-right? (run-or "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-right (run-or "python3 -c 1/0" "python3 -c pass")) => 0)
+  (check (either-right? (run-or "python3 -c pass" "python3 -c 1/0" :cwd (os-temp-dir))) => #t)
+  (check (to-right (run-or "python3 -c pass" "python3 -c 1/0" :cwd (os-temp-dir))) => 0)
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-pipe-test.scm b/tests/liii/subprocess/run-pipe-test.scm
index 828303ed..cd1cd180 100644
--- a/tests/liii/subprocess/run-pipe-test.scm
+++ b/tests/liii/subprocess/run-pipe-test.scm
@@ -42,4 +42,13 @@
   (check (to-left (run-pipe "echo hello" '(false))) => '(1 (false)))
 ) ;when
 
+(when (os-windows?)
+  ;; run-pipe relies on :stdout 'capture internally, which doesn't work reliably on Windows
+  ;; multi-command pipe fails because capture returns empty string
+  (check (either-left? (run-pipe "python3 -c print('hello')" "python3 -c pass")) => #t)
+
+  ;; single command pipe succeeds because the command exits with 0 (though output is empty)
+  (check (either-right? (run-pipe "python3 -c pass")) => #t)
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-sequence-test.scm b/tests/liii/subprocess/run-sequence-test.scm
index 89b1ca0d..8cc49267 100644
--- a/tests/liii/subprocess/run-sequence-test.scm
+++ b/tests/liii/subprocess/run-sequence-test.scm
@@ -32,4 +32,15 @@
   (check (to-right (run-sequence "true" "true" :cwd "/tmp")) => 0)
 ) ;when
 
+(when (os-windows?)
+  (check (either-right? (run-sequence "python3 -c pass" "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-right (run-sequence "python3 -c pass" "python3 -c 1/0" "python3 -c pass")) => 0)
+  (check (either-right? (run-sequence "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-right (run-sequence "python3 -c 1/0" "python3 -c pass")) => 0)
+  (check (either-left? (run-sequence "python3 -c pass" "python3 -c 1/0")) => #t)
+  (check (to-left (run-sequence "python3 -c pass" "python3 -c 1/0")) => 1)
+  (check (either-right? (run-sequence "python3 -c pass" "python3 -c pass" :cwd (os-temp-dir))) => #t)
+  (check (to-right (run-sequence "python3 -c pass" "python3 -c pass" :cwd (os-temp-dir))) => 0)
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-set-bang-test.scm b/tests/liii/subprocess/run-set-bang-test.scm
index a2b02973..30be8902 100644
--- a/tests/liii/subprocess/run-set-bang-test.scm
+++ b/tests/liii/subprocess/run-set-bang-test.scm
@@ -31,4 +31,15 @@
   (check (zero? (run '(my-lambda))) => #t)
 )
 
+(when (os-windows?)
+  (run-set! 'pytrue "python3")
+  (check (zero? (run '(pytrue "-c" "pass"))) => #t)
+
+  (run-set! 'pyfalse "python3")
+  (check (zero? (run '(pyfalse "-c" "1/0"))) => #f)
+
+  (run-set! 'my-lambda (lambda () (display "ok\n")))
+  (check (zero? (run '(my-lambda))) => #t)
+)
+
 (check-report)
diff --git a/tests/liii/subprocess/run-test.scm b/tests/liii/subprocess/run-test.scm
index 00a5f3b4..8848771b 100644
--- a/tests/liii/subprocess/run-test.scm
+++ b/tests/liii/subprocess/run-test.scm
@@ -60,4 +60,26 @@
   (check (run '(printf "%s" "hello world")) => 0)
 ) ;when
 
+(when (os-windows?)
+  (check (zero? (run "python3 -c pass")) => #t)
+  (check (zero? (run "python3 -c 1/0")) => #f)
+  (check (run "python3 -c print('hello')") => 0)
+
+  (let ((orig-dir (getcwd)))
+    (run "python3 -c pass" :cwd (os-temp-dir))
+    (check (getcwd) => orig-dir)
+  ) ;let
+
+  (check-catch 'value-error (run "cd /tmp" :cwd (os-temp-dir)))
+  (check-catch 'value-error (run '(cd "/tmp") :cwd (os-temp-dir)))
+
+  ;; :env (need to preserve PATH on Windows)
+  (let ((path-env (getenv "PATH")))
+    (check (run "python3 -c pass" :env `(("FOO" . "bar") ("PATH" . ,path-env))) => 0))
+
+  ;; list form with symbol head
+  (run-set! 'pyprint "python3")
+  (check (run '(pyprint "-c" "print('hello world')")) => 0)
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-values-test.scm b/tests/liii/subprocess/run-values-test.scm
index e0b5ef29..163ae09a 100644
--- a/tests/liii/subprocess/run-values-test.scm
+++ b/tests/liii/subprocess/run-values-test.scm
@@ -1,4 +1,4 @@
-(import (liii check) (liii os) (liii path) (liii subprocess) (scheme file))
+(import (liii check) (liii os) (liii path) (liii string) (liii subprocess) (scheme file))
 
 ;; run-values
 ;; 执行命令并多值返回 stdout、stderr 和退出码。
@@ -118,4 +118,76 @@
   ) ;let-values
 ) ;when
 
+(when (os-windows?)
+  (let-values (((out err code) (run-values "python3 -c pass")))
+    (check out => "")
+    (check (zero? code) => #t)
+  ) ;let-values
+
+  (let-values (((out err code) (run-values "python3 -c 1/0")))
+    (check out => "")
+    (check (zero? code) => #f)
+  ) ;let-values
+
+  ;; :env (need to preserve PATH on Windows)
+  (let ((path-env (getenv "PATH"))
+        (tmpfile (string-append (os-temp-dir) "/gf-run-values-env-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (let-values (((out err code) (run-values "python3 -c pass" :env `(("FOO" . "bar") ("PATH" . ,path-env)) :stdout tmpfile)))
+      (check (zero? code) => #t))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; :timeout
+  (let-values (((out err code) (run-values "python3 -c \"import time; time.sleep(10)\"" :timeout 1)))
+    (check code => -1)
+  ) ;let-values
+
+  ;; :stdout to file
+  (let ((tmpfile (string-append (os-temp-dir) "/gf-run-values-stdout-win.txt")))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+    (let-values (((out err code) (run-values "python3 -c print('hello')" :stdout tmpfile)))
+      (check out => "")
+      (check (zero? code) => #t)
+      (check (path-read-text tmpfile) => "hello\n"))
+    (when (file-exists? tmpfile) (delete-file tmpfile))
+  ) ;let
+
+  ;; :stdout 'discard
+  (let-values (((out err code) (run-values "python3 -c print('hello')" :stdout 'discard)))
+    (check out => "")
+    (check (zero? code) => #t)
+  ) ;let-values
+
+  ;; :stderr 'discard
+  (let-values (((out err code) (run-values "python3 -c pass" :stderr 'discard)))
+    (check err => "")
+    (check (zero? code) => #t)
+  ) ;let-values
+
+  ;; :stdin from file
+  (let ((infile (string-append (os-temp-dir) "/gf-run-values-stdin-win.txt"))
+        (outfile (string-append (os-temp-dir) "/gf-run-values-stdin-out-win.txt")))
+    (when (file-exists? outfile) (delete-file outfile))
+    (call-with-output-file infile (lambda (p) (display "file content\n" p)))
+    (let ((cmd (string-append "python3 -c \"import sys; open('" (string-replace outfile "\\" "/") "','w').write(sys.stdin.read())\"")))
+      (let-values (((out err code) (run-values cmd :stdin infile)))
+        (check (zero? code) => #t))
+      (check (path-read-text outfile) => "file content\n"))
+    (when (file-exists? infile) (delete-file infile))
+    (when (file-exists? outfile) (delete-file outfile))
+  ) ;let
+
+  ;; :stdin 'null
+  (let-values (((out err code) (run-values "python3 -c pass" :stdin 'null)))
+    (check (zero? code) => #t)
+  ) ;let-values
+
+  ;; list form with symbol head
+  (run-set! 'pypass "python3")
+  (let-values (((out err code) (run-values '(pypass "-c" "print('hello world')"))))
+    (check (zero? code) => #t)
+  ) ;let-values
+) ;when
+
 (check-report)
diff --git a/tests/liii/subprocess/run-when-test.scm b/tests/liii/subprocess/run-when-test.scm
index 4e4d4ab9..a54dade0 100644
--- a/tests/liii/subprocess/run-when-test.scm
+++ b/tests/liii/subprocess/run-when-test.scm
@@ -30,4 +30,14 @@
   (check (to-left (run-when "false" "false")) => '(1 "false"))
 ) ;when
 
+(when (os-windows?)
+  (check (either-right? (run-when "python3 -c 1/0" "python3 -c pass")) => #t)
+  (check (to-right (run-when "python3 -c 1/0" "python3 -c pass")) => 0)
+  (check (either-right? (run-when "python3 -c pass" "python3 -c pass")) => #t)
+  (check (to-right (run-when "python3 -c pass" "python3 -c pass")) => 0)
+
+  (check (either-left? (run-when "python3 -c 1/0" "python3 -c 1/0")) => #t)
+  (check (to-left (run-when "python3 -c 1/0" "python3 -c 1/0")) => '(1 "python3 -c 1/0"))
+) ;when
+
 (check-report)