From c800d7c873f4dca388383d7de4b2bab23bed085c Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 2 Mar 2013 12:47:52 -0800 Subject: [PATCH] CLJ-1076: Fix failing pprint tests on Windows --- test/clojure/test_clojure/pprint.clj | 1 + test/clojure/test_clojure/pprint/test_pretty.clj | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/clojure/test_clojure/pprint.clj b/test/clojure/test_clojure/pprint.clj index 4fdbf69..819c23d 100644 --- a/test/clojure/test_clojure/pprint.clj +++ b/test/clojure/test_clojure/pprint.clj @@ -10,6 +10,7 @@ (ns clojure.test-clojure.pprint (:refer-clojure :exclude [format]) + (:require [clojure.string :as str]) (:use [clojure.test :only (deftest is are run-tests)] [clojure.test-helper :only [platform-newlines]] clojure.test-clojure.pprint.test-helper diff --git a/test/clojure/test_clojure/pprint/test_pretty.clj b/test/clojure/test_clojure/pprint/test_pretty.clj index c7407f1..8e4d1d1 100644 --- a/test/clojure/test_clojure/pprint/test_pretty.clj +++ b/test/clojure/test_clojure/pprint/test_pretty.clj @@ -130,9 +130,11 @@ Usage: *hello* `(simple-tests ~test-name ~@(apply concat (for [block blocks] - `[(with-out-str - (with-pprint-dispatch code-dispatch - (pprint (read-string ~block)))) + `[(str/replace + (with-out-str + (with-pprint-dispatch code-dispatch + (pprint (read-string ~block)))) + "\r" "") (str ~block "\n")])))) (code-block code-block-tests -- 1.8.0