Trying to blindly fix Win64 unit tests

basis/html/templates/fhtml/fhtml-tests.factor

@@ -1,6 +1,6 @@
 USING: io io.files io.streams.string io.encodings.utf8
 html.templates html.templates.fhtml kernel
-tools.test sequences parser ;
+tools.test sequences parser splitting prettyprint ;
 IN: html.templates.fhtml.tests
 
 : test-template ( path -- ? )
@@ -8,8 +8,10 @@ IN: html.templates.fhtml.tests
     prepend
     [
         ".fhtml" append <fhtml> [ call-template ] with-string-writer
+        <string-reader> lines
     ] keep
-    ".html" append utf8 file-contents = ;
+    ".html" append utf8 file-lines
+    [ . . ] [ = ] 2bi ;
 
 [ t ] [ "example" test-template ] unit-test
 [ t ] [ "bug" test-template ] unit-test

core/io/io-tests.factor

@@ -25,6 +25,11 @@ IN: io.tests
 ! Make sure we use correct to_c_string form when writing
 [ ] [ "\0" write ] unit-test
 
+[ ] [
+    "It seems Jobs has lost his grasp on reality again.\n"
+    "separator-test.txt" temp-file latin1 set-file-contents
+] unit-test
+
 [
     {
         { "It seems " CHAR: J }
@@ -33,7 +38,7 @@ IN: io.tests
     }
 ] [
     [
-        "resource:core/io/test/separator-test.txt"
+        "separator-test.txt" temp-file
         latin1 <file-reader> [
             "J" read-until 2array ,
             "i" read-until 2array ,

core/io/test/separator-test.txt

@@ -1 +0,0 @@
-It seems Jobs has lost his grasp on reality again.

extra/benchmark/regex-dna/regex-dna-tests.factor

@@ -1,10 +1,10 @@
 USING: benchmark.regex-dna io io.files io.encodings.ascii
-io.streams.string kernel tools.test ;
+io.streams.string kernel tools.test splitting ;
 IN: benchmark.regex-dna.tests
 
 [ t ] [
     "resource:extra/benchmark/regex-dna/regex-dna-test-in.txt"
-    [ regex-dna ] with-string-writer
+    [ regex-dna ] with-string-writer string-lines
     "resource:extra/benchmark/regex-dna/regex-dna-test-out.txt"
-    ascii file-contents =
+    ascii file-lines =
 ] unit-test

extra/contributors/contributors.factor

@@ -7,7 +7,7 @@ IN: contributors
 
 : changelog ( -- authors )
     image parent-directory [
-        "git-log --pretty=format:%an" ascii <process-reader> lines
+        "git log --pretty=format:%an" ascii <process-reader> lines
     ] with-directory ;
 
 : patch-counts ( authors -- assoc )

extra/mason/child/child-tests.factor

@@ -1,7 +1,7 @@
 IN: mason.child.tests
 USING: mason.child mason.config tools.test namespaces ;
 
-[ { "make" "clean" "winnt-x86-32" } ] [
+[ { "make" "winnt-x86-32" } ] [
     [
         "winnt" target-os set
         "x86.32" target-cpu set
@@ -9,7 +9,7 @@ USING: mason.child mason.config tools.test namespaces ;
     ] with-scope
 ] unit-test
 
-[ { "make" "clean" "macosx-x86-32" } ] [
+[ { "make" "macosx-x86-32" } ] [
     [
         "macosx" target-os set
         "x86.32" target-cpu set
@@ -17,7 +17,7 @@ USING: mason.child mason.config tools.test namespaces ;
     ] with-scope
 ] unit-test
 
-[ { "gmake" "clean" "netbsd-ppc" } ] [
+[ { "gmake" "netbsd-ppc" } ] [
     [
         "netbsd" target-os set
         "ppc" target-cpu set