From 2cbc9794603ea983ca5074520bbef60a1c9bd97e Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 21 Nov 2008 20:09:23 -0600 Subject: [PATCH] Bail out on line-endings workarounds now that we have a better fix for that on Win64 --- basis/html/templates/fhtml/fhtml-tests.factor | 7 ++----- extra/benchmark/regex-dna/regex-dna-tests.factor | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/basis/html/templates/fhtml/fhtml-tests.factor b/basis/html/templates/fhtml/fhtml-tests.factor index d314a60124..6cebb55688 100644 --- a/basis/html/templates/fhtml/fhtml-tests.factor +++ b/basis/html/templates/fhtml/fhtml-tests.factor @@ -6,11 +6,8 @@ IN: html.templates.fhtml.tests : test-template ( path -- ? ) "resource:basis/html/templates/fhtml/test/" prepend - [ - ".fhtml" append [ call-template ] with-string-writer - lines - ] keep - ".html" append utf8 file-lines + [ ".fhtml" append [ call-template ] with-string-writer ] + [ ".html" append utf8 file-contents ] bi [ . . ] [ = ] 2bi ; [ t ] [ "example" test-template ] unit-test diff --git a/extra/benchmark/regex-dna/regex-dna-tests.factor b/extra/benchmark/regex-dna/regex-dna-tests.factor index 9f64d438c7..cdd83cb9af 100644 --- a/extra/benchmark/regex-dna/regex-dna-tests.factor +++ b/extra/benchmark/regex-dna/regex-dna-tests.factor @@ -4,7 +4,7 @@ IN: benchmark.regex-dna.tests [ t ] [ "resource:extra/benchmark/regex-dna/regex-dna-test-in.txt" - [ regex-dna ] with-string-writer lines + [ regex-dna ] with-string-writer "resource:extra/benchmark/regex-dna/regex-dna-test-out.txt" - ascii file-lines = + ascii file-contents = ] unit-test