diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-19 11:13:34 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-19 11:13:34 -0700 |
| commit | 30373989771e0be8c0e690210da1c8b7e24942a1 (patch) | |
| tree | 9ad9ca3ce8cd8bb38cfdee64c791a177875a0d9a /src | |
| parent | b6ba7ea9f0499335feba6838da80f4333e2d366f (diff) | |
| parent | 48d14aaaced95ef2577bf8bc799c4a74788e4663 (diff) | |
| download | scala-30373989771e0be8c0e690210da1c8b7e24942a1.tar.gz scala-30373989771e0be8c0e690210da1c8b7e24942a1.tar.bz2 scala-30373989771e0be8c0e690210da1c8b7e24942a1.zip | |
Merge pull request #2854 from som-snytt/issue/7729-slash
SI-7729 Fix broken windows build
Diffstat (limited to 'src')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Runner.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala index fa2fb99f2f..470a2188de 100644 --- a/src/partest/scala/tools/partest/nest/Runner.scala +++ b/src/partest/scala/tools/partest/nest/Runner.scala @@ -357,7 +357,7 @@ class Runner(val testFile: File, fileManager: FileManager, val testRunParams: Te val ellipsis = "" //".../" // using * looks like a comment // no spaces in test file paths below root, because otherwise how to detect end of path string? - val pathFinder = raw"""(?i)\Q${elided}${File.separator}\E([\${File.separator}\w]*)""".r + val pathFinder = raw"""(?i)\Q${elided}${File.separator}\E([\${File.separator}\S]*)""".r def canonicalize(s: String): String = ( pathFinder replaceAllIn (s, m => ellipsis + squashSlashes(m group 1)) ) |