From 48d14aaaced95ef2577bf8bc799c4a74788e4663 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Mon, 19 Aug 2013 07:22:28 -0700 Subject: 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. --- src/partest/scala/tools/partest/nest/Runner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/partest') 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)) ) -- cgit v1.2.3