Merge pull request scala#7477 from som-snytt/issue/sd-589

SethTisue · web-flow · commit 837309f0f960 · 2018-11-30T17:23:44.000-08:00
Exclude process test from windows
diff --git a/test/junit/scala/sys/process/ProcessTest.scala b/test/junit/scala/sys/process/ProcessTest.scala
@@ -83,7 +83,7 @@ class ProcessTest {
   }
 
   // a test for A && B where A fails and B is not started
-  @Test def t10823_short_circuit(): Unit = {
+  @Test def t10823_short_circuit(): Unit = testily {
     def createFile(prefix: String) = {
       val file = createTempFile(prefix, "tmp")
       Files.write(file, List(prefix).asJava, UTF_8)

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class ProcessTest {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// a test for A && B where A fails and B is not started`
`86`		`- @Test def t10823_short_circuit(): Unit = {`
	`86`	`+ @Test def t10823_short_circuit(): Unit = testily {`
`87`	`87`	`def createFile(prefix: String) = {`
`88`	`88`	`val file = createTempFile(prefix, "tmp")`
`89`	`89`	`Files.write(file, List(prefix).asJava, UTF_8)`