From a92425adef2ce5aec60ff25756965dbf6f18c787 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 16 Dec 2008 12:53:04 -0600
Subject: [PATCH] fix launcher tests

---
 basis/io/launcher/windows/nt/nt-tests.factor | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/basis/io/launcher/windows/nt/nt-tests.factor b/basis/io/launcher/windows/nt/nt-tests.factor
index 62fe45dc7f..93b1e8c2ff 100644
--- a/basis/io/launcher/windows/nt/nt-tests.factor
+++ b/basis/io/launcher/windows/nt/nt-tests.factor
@@ -41,8 +41,11 @@ IN: io.launcher.windows.nt.tests
     try-process
 ] unit-test
 
+: launcher-test-path ( -- str )
+    "resource:basis/io/launcher/windows/nt/test" ;
+
 [ ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "stderr.factor" 3array >>command
             "out.txt" temp-file >>stdout
@@ -60,7 +63,7 @@ IN: io.launcher.windows.nt.tests
 ] unit-test
 
 [ ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "stderr.factor" 3array >>command
             "out.txt" temp-file >>stdout
@@ -74,7 +77,7 @@ IN: io.launcher.windows.nt.tests
 ] unit-test
 
 [ "output" ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "stderr.factor" 3array >>command
             "err2.txt" temp-file >>stderr
@@ -87,7 +90,7 @@ IN: io.launcher.windows.nt.tests
 ] unit-test
 
 [ t ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "env.factor" 3array >>command
         ascii <process-reader> contents
@@ -97,7 +100,7 @@ IN: io.launcher.windows.nt.tests
 ] unit-test
 
 [ t ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "env.factor" 3array >>command
             +replace-environment+ >>environment-mode
@@ -109,7 +112,7 @@ IN: io.launcher.windows.nt.tests
 ] unit-test
 
 [ "B" ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "env.factor" 3array >>command
             { { "A" "B" } } >>environment
@@ -120,7 +123,7 @@ IN: io.launcher.windows.nt.tests
 ] unit-test
 
 [ f ] [
-    "resource:basis/io/windows/nt/launcher/test" [
+    launcher-test-path [
         <process>
             vm "-script" "env.factor" 3array >>command
             { { "USERPROFILE" "XXX" } } >>environment
@@ -146,7 +149,7 @@ IN: io.launcher.windows.nt.tests
 
 [ "Hello appender\r\nHello appender\r\n" ] [
     2 [
-        "resource:basis/io/windows/nt/launcher/test" [
+        launcher-test-path [
             <process>
                 vm "-script" "append.factor" 3array >>command
                 "append-test" temp-file <appender> >>stdout