diff options
| author | Paul Phillips <paulp@improving.org> | 2013-08-20 08:44:03 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-08-20 08:44:03 -0700 |
| commit | 01f771e687291803da1983bdac97d9288c069bfe (patch) | |
| tree | 5c0e664803a9682bb25c6b48658d0660d9727a02 /src/partest | |
| parent | 6d4e71c111226591a4eeb5b77efac689ef1dd79a (diff) | |
| parent | 1df7b32a15bac0c57d4371b6e081f06d9e145aaf (diff) | |
| download | scala-01f771e687291803da1983bdac97d9288c069bfe.tar.gz scala-01f771e687291803da1983bdac97d9288c069bfe.tar.bz2 scala-01f771e687291803da1983bdac97d9288c069bfe.zip | |
Merge branch 'master' into patmat
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala
Diffstat (limited to 'src/partest')
| -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)) ) |