diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2022-05-31 01:58:40 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2022-05-31 01:58:40 -0700 |
commit | 01b8820c28320434d3ef69bde1cf646d9592f590 (patch) | |
tree | 34637f08434aad4206c087438757b74631fa8064 /tests/018 | |
parent | c552f56aefca032aee55824bf17969040ae0060b (diff) | |
download | txr-01b8820c28320434d3ef69bde1cf646d9592f590.tar.gz txr-01b8820c28320434d3ef69bde1cf646d9592f590.tar.bz2 txr-01b8820c28320434d3ef69bde1cf646d9592f590.zip |
cygwin: bug: sh always uses cmd.exe.
* stream.c (sh): Use a single definition for this function,
which uses the shell and shell_arg variables to use
either /bin/sh -c or cmd.exe /c. We only want to use
cmd.exe when running as a Windows native program on Cygnal.
* tests/018/process.tl: Remove workaround from test case.
This is what was causing the weirdness.
Diffstat (limited to 'tests/018')
-rw-r--r-- | tests/018/process.tl | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/018/process.tl b/tests/018/process.tl index ce545dc3..58a12fa2 100644 --- a/tests/018/process.tl +++ b/tests/018/process.tl @@ -16,15 +16,9 @@ ^(with-stream (s (open-subprocess nil "r" nil (lambda () ,*forms))) (get-string s))) -(caseq (os-symbol) - ((:cygwin :cygnal) - (mtest - (fcmd (let ((*stdout* *stdnull*)) (sh "echo foo"))) "" - (fcmd (let ((*stderr* *stdout*)) (sh "echo foo 1>&2"))) "foo \r\n")) - (t - (mtest - (fcmd (let ((*stdout* *stdnull*)) (sh "echo foo"))) "" - (fcmd (let ((*stderr* *stdout*)) (sh "echo foo 1>&2"))) "foo\n"))) +(mtest + (fcmd (let ((*stdout* *stdnull*)) (sh "echo foo"))) "" + (fcmd (let ((*stderr* *stdout*)) (sh "echo foo 1>&2"))) "foo\n") (caseq (os-symbol) ((:cygwin :cygnal)) |