diff options
| author | Som Snytt <som.snytt@gmail.com> | 2013-08-19 07:22:28 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2013-08-19 07:22:28 -0700 |
| commit | 48d14aaaced95ef2577bf8bc799c4a74788e4663 (patch) | |
| tree | 1c50d0bfa62ba89e2ab7848ab335dc3fbeda0725 /src/partest | |
| parent | 5084b74048f7f21f38fdf45ebfa8e634b863bb01 (diff) | |
| download | scala-48d14aaaced95ef2577bf8bc799c4a74788e4663.tar.gz scala-48d14aaaced95ef2577bf8bc799c4a74788e4663.tar.bz2 scala-48d14aaaced95ef2577bf8bc799c4a74788e4663.zip | |
SI-7729 Fix broken windows build
Fixing #ifdiff uncovered a latent bug in partest when it detects
paths to normalize in test log output. It would not normalize
file separators for test names with non-word characters.
This commit normalizes the test name to the ticket number as a
workaround until the next partest version is picked up.
It also fixes partest in this repo in case we've not yet switched
over to the new repo. A separate PR will be submitted to the new
repo as necessary.
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)) ) |