diff --git a/backend/mirai-console/src/MiraiConsoleImplementation.kt b/backend/mirai-console/src/MiraiConsoleImplementation.kt index 3b089971f..db474e323 100644 --- a/backend/mirai-console/src/MiraiConsoleImplementation.kt +++ b/backend/mirai-console/src/MiraiConsoleImplementation.kt @@ -36,7 +36,6 @@ import java.util.* import java.util.concurrent.locks.ReentrantLock import kotlin.annotation.AnnotationTarget.* import kotlin.coroutines.CoroutineContext -import kotlin.system.exitProcess /** @@ -286,14 +285,7 @@ public interface MiraiConsoleImplementation : CoroutineScope { }.onFailure { it.printStackTrace() } - Thread.sleep(3000L) // 保证信息打印完成 - if (!IS_GRADLE_TEST) exitProcess(1) - // For gradle tests, killing the JVM also kills a Gradle worker which cause './gradlew test' to fail. - // See https://github.com/gradle/gradle/issues/11195 for more information. } } } -} - -@JvmField -internal var IS_GRADLE_TEST = false \ No newline at end of file +} \ No newline at end of file diff --git a/backend/mirai-console/test/TestMiraiConosle.kt b/backend/mirai-console/test/TestMiraiConosle.kt index 1f6c63b44..4eafd89aa 100644 --- a/backend/mirai-console/test/TestMiraiConosle.kt +++ b/backend/mirai-console/test/TestMiraiConosle.kt @@ -33,7 +33,6 @@ import kotlin.test.assertNotNull @OptIn(ConsoleInternalApi::class, kotlin.io.path.ExperimentalPathApi::class) fun initTestEnvironment() { - IS_GRADLE_TEST = true object : MiraiConsoleImplementation { override val rootPath: Path = createTempDirectory() diff --git a/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt b/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt index 25aa96ab4..1c2fcf31e 100644 --- a/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt +++ b/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt @@ -47,6 +47,10 @@ object MiraiConsoleTerminalLoader { startAsDaemon() try { runBlocking { + MiraiConsole.job.invokeOnCompletion { + Thread.sleep(1000) // 保证错误信息打印完全 + exitProcess(0) + } MiraiConsole.job.join() } } catch (e: CancellationException) {