summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--stream.c13
-rw-r--r--tests/018/process.tl12
2 files changed, 7 insertions, 18 deletions
diff --git a/stream.c b/stream.c
index 0740dda1..be6262b1 100644
--- a/stream.c
+++ b/stream.c
@@ -4871,11 +4871,6 @@ static val run(val command, val args)
return (status < 0) ? nil : num(status);
}
-static val sh(val command)
-{
- return run(lit("cmd.exe"), list(lit("/C"), command, nao));
-}
-
#elif HAVE_FORK_STUFF
static val run(val name, val args)
@@ -4948,15 +4943,15 @@ out:
return ret;
}
+#else
+#error port me!
+#endif
+
static val sh(val command)
{
return run(shell, list(shell_arg, command, nao));
}
-#else
-#error port me!
-#endif
-
val remove_path(val path, val throw_on_error)
{
val self = lit("remove-path");
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))