Merge pull request scala#4795 from SethTisue/windows-ci

improvements to Windows build & test situation

Author: lrytz

README.md

@@ -76,6 +76,8 @@ but the CI will verify against the baseline version.)
 
 You'll also need Apache Ant (version 1.9.0 or above) and curl (for `./pull-binary-libs.sh`).
 
+Mac OS X and Linux work. Windows may work if you use Cygwin. (Community help with keeping the build working on Windows is appreciated.)
+
 ## Git Hygiene
 
 As git history is forever, we take great pride in the quality of the commits we merge into the repository. The title of your commit will be read hundreds (of thousands? :-)) of times, so it pays off to spend just a little bit more time to polish it, making it descriptive and concise. Please take a minute to read the advice [most projects agree on](https://github.com/erlang/otp/wiki/Writing-good-commit-messages), and stick to 72 or fewer characters for the first line, wrapping subsequent ones at 80 (at most).

scripts/jobs/integrate/windows

@@ -0,0 +1,15 @@
+#!/bin/bash -x
+
+./pull-binary-libs.sh
+
+export ANT_OPTS="-Dfile.encoding=UTF-8 -server -XX:+AggressiveOpts -XX:+UseParNewGC -Xmx2G -Xss1M -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=128M"
+
+# TODO: don't hardcode this path, which is just where we currently have
+# ant manually installed on jenkins-worker-windows-publish.
+PATH=/cygdrive/c/apache-ant-1.9.6/bin:$PATH
+
+ant \
+  -Dstarr.version=2.11.7 \
+  -Dscalac.args.optimise=-optimise \
+  -Dlocker.skip=1 \
+  test

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

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 {

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"

tools/get-scala-commit-date.bat

@@ -1,9 +1,9 @@
 @echo off
 for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)
 if defined FOUND (
-  bash "%~dp0\get-scala-commit-date"
+  bash "%~dp0\get-scala-commit-date" 2>NUL
 ) else (
   rem echo this script does not work with cmd.exe. please, install bash
   echo unknown
   exit 1
-)
+)

tools/get-scala-commit-sha.bat

@@ -1,9 +1,9 @@
 @echo off
 for %%X in (bash.exe) do (set FOUND=%%~$PATH:X)
 if defined FOUND (
-  bash "%~dp0\get-scala-commit-sha"
+  bash "%~dp0\get-scala-commit-sha" 2>NUL
 ) else (
   rem echo this script does not work with cmd.exe. please, install bash
   echo unknown
   exit 1
-)
+)