diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/t7634.check | 4 | ||||
| -rw-r--r-- | test/files/run/t7634.scala | 2 | ||||
| -rwxr-xr-x | test/partest | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/test/files/run/t7634.check b/test/files/run/t7634.check index 879aea67a2..43128cad95 100644 --- a/test/files/run/t7634.check +++ b/test/files/run/t7634.check @@ -1,6 +1,6 @@ -scala> .lines -res1: List[String] = List(shello, world.) +scala> .lines.foreach(println) +shello, world. scala> :quit diff --git a/test/files/run/t7634.scala b/test/files/run/t7634.scala index aeb6a5e671..9520931941 100644 --- a/test/files/run/t7634.scala +++ b/test/files/run/t7634.scala @@ -9,7 +9,7 @@ import scala.util.Properties.propOrElse object Test extends ReplTest { def java = propOrElse("javacmd", "java") def code = s""":sh $java -classpath $testOutput hello.Hello - |.lines""".stripMargin + |.lines.foreach(println)""".stripMargin } package hello { diff --git a/test/partest b/test/partest index 8b827f276f..cb07c00e04 100755 --- a/test/partest +++ b/test/partest @@ -22,6 +22,14 @@ findScalaHome () { } # Use tput to detect color-capable terminal. +# (note: I have found that on Cygwin, the script sometimes dies here. +# it doesn't happen from the Cygwin prompt when ssh'ing in to +# jenkins-worker-windows-publish, only when I make a Jenkins job +# that runs this script. I don't know why. it may have to do with +# which bash flags are set (-e? -x?) and with bash flags propagating +# from one script to another? not sure. anyway, normally in a CI +# context we run partest through ant, not through this script, so I'm +# not investigating further for now.) term_colors=$(tput colors 2>/dev/null) if [[ $? == 0 ]] && [[ $term_colors -gt 2 ]]; then git_diff_options="--color=always --word-diff" |