Support tests on Linux without wrapper

GitOrigin-RevId: 3ba9440240e8d80e1b85c51cb64eb7f25eb57947
JetBrains · Aug 30, 2023 · 4728c9d · 4728c9d
1 parent f8868a7
commit 4728c9d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/intellij.tools.ide.starter/src/com/intellij/ide/starter/process/processUtils.kt b/intellij.tools.ide.starter/src/com/intellij/ide/starter/process/processUtils.kt
@@ -1,15 +1,12 @@
 package com.intellij.ide.starter.process
 
-import com.intellij.ide.starter.di.di
 import com.intellij.ide.starter.path.GlobalPaths
 import com.intellij.ide.starter.process.exec.ExecOutputRedirect
 import com.intellij.ide.starter.process.exec.ProcessExecutor
 import com.intellij.ide.starter.system.SystemInfo
 import com.intellij.ide.starter.utils.catchAll
 import com.intellij.ide.starter.utils.logOutput
 import com.intellij.ide.starter.utils.withRetry
-import org.kodein.di.direct
-import org.kodein.di.instance
 import java.nio.file.Path
 import kotlin.io.path.isRegularFile
 import kotlin.time.Duration.Companion.minutes
@@ -231,6 +228,11 @@ private fun getJavaProcessId(javaHome: Path, workDir: Path, originalProcessId: L
     }
   }
 
+  if (originalProcess.info().command().get().contains("java")){
+    logOutput("The test was run without wrapper, add original pid")
+    candidatesFromProcessHandle.add(originalProcess.pid())
+  }
+
   originalProcess.toHandle().descendants().forEach { processHandle ->
     val command = processHandle.info().command()
     if (command.isPresent && command.get().contains("java")) {