Skip to content

Commit

Permalink
Merge pull request #10343 from SethTisue/fix-semantic-merge-conflict
Browse files Browse the repository at this point in the history
fix semantic merge conflict in partest tool
  • Loading branch information
som-snytt committed Mar 14, 2023
2 parents ca4831f + eb31270 commit c422784
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/partest/scala/tools/partest/nest/Runner.scala
Expand Up @@ -365,7 +365,7 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) {
// 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}\S]*)""".r
def canonicalize: String => String = {
val hiders = toolArgs("hide", split = false).map(_.r)
val hiders = toolArgs(ToolName.hide).map(_.r)
(s: String) => {
val pathless = pathFinder.replaceAllIn(s, m => Regex.quoteReplacement(ellipsis + squashSlashes(m.group(1))))
if (hiders.isEmpty) pathless
Expand Down

0 comments on commit c422784

Please sign in to comment.