Tweak launcher test: it failed without cygwin

diff --git a/basis/io/windows/nt/launcher/launcher-tests.factor b/basis/io/windows/nt/launcher/launcher-tests.factor
index 949b0a796110450228cc6a1eb7035a8b730ff718..cbae2f5eca49a60b687638e6cf90de5596cce99c 100644 (file)
--- a/basis/io/windows/nt/launcher/launcher-tests.factor
+++ b/basis/io/windows/nt/launcher/launcher-tests.factor
@@ -1,157 +1,157 @@
-USING: io.launcher tools.test calendar accessors environment\r
-namespaces kernel system arrays io io.files io.encodings.ascii\r
-sequences parser assocs hashtables math continuations eval ;\r
-IN: io.windows.launcher.nt.tests\r
-\r
-[ ] [\r
-    <process>\r
-        "notepad" >>command\r
-        1/2 seconds >>timeout\r
-    "notepad" set\r
-] unit-test\r
-\r
-[ f ] [ "notepad" get process-running? ] unit-test\r
-\r
-[ f ] [ "notepad" get process-started? ] unit-test\r
-\r
-[ ] [ "notepad" [ run-detached ] change ] unit-test\r
-\r
-[ "notepad" get wait-for-process ] must-fail\r
-\r
-[ t ] [ "notepad" get killed>> ] unit-test\r
-\r
-[ f ] [ "notepad" get process-running? ] unit-test\r
-\r
-[ ] [\r
-    <process>\r
-        vm "-quiet" "-run=hello-world" 3array >>command\r
-        "out.txt" temp-file >>stdout\r
-    try-process\r
-] unit-test\r
-\r
-[ "Hello world" ] [\r
-    "out.txt" temp-file ascii file-lines first\r
-] unit-test\r
-\r
-[ ] [\r
-    <process>\r
-        vm "-run=listener" 2array >>command\r
-        +closed+ >>stdin\r
-    try-process\r
-] unit-test\r
-\r
-[ ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "stderr.factor" 3array >>command\r
-            "out.txt" temp-file >>stdout\r
-            "err.txt" temp-file >>stderr\r
-        try-process\r
-    ] with-directory\r
-] unit-test\r
-\r
-[ "output" ] [\r
-    "out.txt" temp-file ascii file-lines first\r
-] unit-test\r
-\r
-[ "error" ] [\r
-    "err.txt" temp-file ascii file-lines first\r
-] unit-test\r
-\r
-[ ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "stderr.factor" 3array >>command\r
-            "out.txt" temp-file >>stdout\r
-            +stdout+ >>stderr\r
-        try-process\r
-    ] with-directory\r
-] unit-test\r
-\r
-[ "outputerror" ] [\r
-    "out.txt" temp-file ascii file-lines first\r
-] unit-test\r
-\r
-[ "output" ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "stderr.factor" 3array >>command\r
-            "err2.txt" temp-file >>stderr\r
-        ascii <process-reader> lines first\r
-    ] with-directory\r
-] unit-test\r
-\r
-[ "error" ] [\r
-    "err2.txt" temp-file ascii file-lines first\r
-] unit-test\r
-\r
-[ t ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "env.factor" 3array >>command\r
-        ascii <process-reader> contents\r
-    ] with-directory eval\r
-\r
-    os-envs =\r
-] unit-test\r
-\r
-[ t ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "env.factor" 3array >>command\r
-            +replace-environment+ >>environment-mode\r
-            os-envs >>environment\r
-        ascii <process-reader> contents\r
-    ] with-directory eval\r
-    \r
-    os-envs =\r
-] unit-test\r
-\r
-[ "B" ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "env.factor" 3array >>command\r
-            { { "A" "B" } } >>environment\r
-        ascii <process-reader> contents\r
-    ] with-directory eval\r
-\r
-    "A" swap at\r
-] unit-test\r
-\r
-[ f ] [\r
-    "resource:basis/io/windows/nt/launcher/test" [\r
-        <process>\r
-            vm "-script" "env.factor" 3array >>command\r
-            { { "HOME" "XXX" } } >>environment\r
-            +prepend-environment+ >>environment-mode\r
-        ascii <process-reader> contents\r
-    ] with-directory eval\r
-\r
-    "HOME" swap at "XXX" =\r
-] unit-test\r
-\r
-2 [\r
-    [ ] [\r
-        <process>\r
-            "cmd.exe /c dir" >>command\r
-            "dir.txt" temp-file >>stdout\r
-        try-process\r
-    ] unit-test\r
-\r
-    [ ] [ "dir.txt" temp-file delete-file ] unit-test\r
-] times\r
-\r
-[ "append-test" temp-file delete-file ] ignore-errors\r
-\r
-[ "Hello appender\r\nHello appender\r\n" ] [\r
-    2 [\r
-        "resource:basis/io/windows/nt/launcher/test" [\r
-            <process>\r
-                vm "-script" "append.factor" 3array >>command\r
-                "append-test" temp-file <appender> >>stdout\r
-            try-process\r
-        ] with-directory\r
-    ] times\r
-   \r
-    "append-test" temp-file ascii file-contents\r
-] unit-test\r
+USING: io.launcher tools.test calendar accessors environment
+namespaces kernel system arrays io io.files io.encodings.ascii
+sequences parser assocs hashtables math continuations eval ;
+IN: io.windows.launcher.nt.tests
+
+[ ] [
+    <process>
+        "notepad" >>command
+        1/2 seconds >>timeout
+    "notepad" set
+] unit-test
+
+[ f ] [ "notepad" get process-running? ] unit-test
+
+[ f ] [ "notepad" get process-started? ] unit-test
+
+[ ] [ "notepad" [ run-detached ] change ] unit-test
+
+[ "notepad" get wait-for-process ] must-fail
+
+[ t ] [ "notepad" get killed>> ] unit-test
+
+[ f ] [ "notepad" get process-running? ] unit-test
+
+[ ] [
+    <process>
+        vm "-quiet" "-run=hello-world" 3array >>command
+        "out.txt" temp-file >>stdout
+    try-process
+] unit-test
+
+[ "Hello world" ] [
+    "out.txt" temp-file ascii file-lines first
+] unit-test
+
+[ ] [
+    <process>
+        vm "-run=listener" 2array >>command
+        +closed+ >>stdin
+    try-process
+] unit-test
+
+[ ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "stderr.factor" 3array >>command
+            "out.txt" temp-file >>stdout
+            "err.txt" temp-file >>stderr
+        try-process
+    ] with-directory
+] unit-test
+
+[ "output" ] [
+    "out.txt" temp-file ascii file-lines first
+] unit-test
+
+[ "error" ] [
+    "err.txt" temp-file ascii file-lines first
+] unit-test
+
+[ ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "stderr.factor" 3array >>command
+            "out.txt" temp-file >>stdout
+            +stdout+ >>stderr
+        try-process
+    ] with-directory
+] unit-test
+
+[ "outputerror" ] [
+    "out.txt" temp-file ascii file-lines first
+] unit-test
+
+[ "output" ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "stderr.factor" 3array >>command
+            "err2.txt" temp-file >>stderr
+        ascii <process-reader> lines first
+    ] with-directory
+] unit-test
+
+[ "error" ] [
+    "err2.txt" temp-file ascii file-lines first
+] unit-test
+
+[ t ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "env.factor" 3array >>command
+        ascii <process-reader> contents
+    ] with-directory eval
+
+    os-envs =
+] unit-test
+
+[ t ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "env.factor" 3array >>command
+            +replace-environment+ >>environment-mode
+            os-envs >>environment
+        ascii <process-reader> contents
+    ] with-directory eval
+    
+    os-envs =
+] unit-test
+
+[ "B" ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "env.factor" 3array >>command
+            { { "A" "B" } } >>environment
+        ascii <process-reader> contents
+    ] with-directory eval
+
+    "A" swap at
+] unit-test
+
+[ f ] [
+    "resource:basis/io/windows/nt/launcher/test" [
+        <process>
+            vm "-script" "env.factor" 3array >>command
+            { { "USERPROFILE" "XXX" } } >>environment
+            +prepend-environment+ >>environment-mode
+        ascii <process-reader> contents
+    ] with-directory eval
+
+    "USERPROFILE" swap at "XXX" =
+] unit-test
+
+2 [
+    [ ] [
+        <process>
+            "cmd.exe /c dir" >>command
+            "dir.txt" temp-file >>stdout
+        try-process
+    ] unit-test
+
+    [ ] [ "dir.txt" temp-file delete-file ] unit-test
+] times
+
+[ "append-test" temp-file delete-file ] ignore-errors
+
+[ "Hello appender\r\nHello appender\r\n" ] [
+    2 [
+        "resource:basis/io/windows/nt/launcher/test" [
+            <process>
+                vm "-script" "append.factor" 3array >>command
+                "append-test" temp-file <appender> >>stdout
+            try-process
+        ] with-directory
+    ] times
+   
+    "append-test" temp-file ascii file-contents
+] unit-test