diff options
author | Seth Tisue <seth@tisue.net> | 2016-01-13 09:27:30 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-01-13 09:27:30 -0500 |
commit | 334cbc720fd3020b59271bf060747bc2350e1f89 (patch) | |
tree | a1c53f5e4fddd4e28fb79a8781e0448a64aee078 | |
parent | fb22e2b0a73605d654c153e02d454e5cec21f355 (diff) | |
parent | a4242d6d905454fb04c04dd541f549a85fdd84d4 (diff) | |
download | scala-334cbc720fd3020b59271bf060747bc2350e1f89.tar.gz scala-334cbc720fd3020b59271bf060747bc2350e1f89.tar.bz2 scala-334cbc720fd3020b59271bf060747bc2350e1f89.zip |
Merge pull request #4897 from linasm/stringContextTest-windows
Make StringContextTest pass on Windows
-rw-r--r-- | test/junit/scala/StringContextTest.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/junit/scala/StringContextTest.scala b/test/junit/scala/StringContextTest.scala index 900852fcc6..b93cd978f4 100644 --- a/test/junit/scala/StringContextTest.scala +++ b/test/junit/scala/StringContextTest.scala @@ -224,11 +224,10 @@ class StringContextTest { // literals and arg indexes f"%%" -> "%", - f" mind%n------%nmatter%n" -> + f" mind%n------%nmatter" -> """| mind |------ - |matter - |""".stripMargin, + |matter""".stripMargin.lines.mkString(compat.Platform.EOL), f"${i}%d %<d ${9}%d" -> "42 42 9", f"${7}%d %<d ${9}%d" -> "7 7 9", f"${7}%d %2$$d ${9}%d" -> "7 9 9", |