diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
| commit | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (patch) | |
| tree | d6c86e80b08b47271e65bccfe734e80bc531be8f /test/pending | |
| parent | 4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff) | |
| parent | 6a185e3c97b79716576725f1ecf0ba629e83951d (diff) | |
| download | scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.gz scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.bz2 scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150501
Diffstat (limited to 'test/pending')
| -rw-r--r-- | test/pending/jvm/javasigs.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/pending/jvm/javasigs.scala b/test/pending/jvm/javasigs.scala index 8da59ab0a0..d18a4e6fb5 100644 --- a/test/pending/jvm/javasigs.scala +++ b/test/pending/jvm/javasigs.scala @@ -32,7 +32,7 @@ object Scalatest { } - /** Execute cmd, wait for the process to end and pipe it's output to stdout */ + /** Execute cmd, wait for the process to end and pipe its output to stdout */ def exec(cmd: String) { val proc = Runtime.getRuntime().exec(cmd) val inp = new BufferedReader(new InputStreamReader(proc.getInputStream)) |