From 5cfd162d330eaf893180194c1a32e025cfe1992a Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 13 Jan 2015 18:43:27 +0300 Subject: [PATCH] fixed blinking ExecutionManagerTest.testRun --- .../src/com/intellij/debugger/impl/OutputChecker.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java index a250715fec12..23a45ba455eb 100644 --- a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java +++ b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -208,6 +208,9 @@ public class OutputChecker { result = result.replaceAll("\"(!JDK_HOME!.*?)\"", "$1"); result = result.replaceAll("\"(!APP_PATH!.*?)\"", "$1"); + // unquote extra params + result = result.replaceAll("\"(-D.*)\"", "$1"); + result = result.replaceAll("-Didea.launcher.port=\\d*", "-Didea.launcher.port=!IDEA_LAUNCHER_PORT!"); result = result.replaceAll("-Dfile.encoding=[\\w\\d-]*", "-Dfile.encoding=!FILE_ENCODING!"); result = result.replaceAll("\\((.*)\\:\\d+\\)", "($1:!LINE_NUMBER!)");