From 6f240351546d11705d331cb80b5c90493271a489 Mon Sep 17 00:00:00 2001
From: Karlatemp <karlatemp@vip.qq.com>
Date: Sat, 15 Jan 2022 19:17:04 +0800
Subject: [PATCH] Update mirai-console.integration-test
---
mirai-console/backend/integration-test/build.gradle.kts | 5 +++--
.../backend/integration-test/src/IntegrationTestBootstrap.kt | 1 +
settings.gradle.kts | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/mirai-console/backend/integration-test/build.gradle.kts b/mirai-console/backend/integration-test/build.gradle.kts
index b7acd9b62..e12c6d490 100644
--- a/mirai-console/backend/integration-test/build.gradle.kts
+++ b/mirai-console/backend/integration-test/build.gradle.kts
@@ -83,8 +83,9 @@ mcit_test.configure {
}
}
-rootProject.allprojects {
- if (project.path.removePrefix(":").startsWith("mirai-console.integration-test.tp.")) {
+val crtProject = project
+subprojects {
+ if (project.parent == crtProject) {
project.afterEvaluate {
val tk = tasks.named<Jar>("jar")
subplugins.add(tk)
diff --git a/mirai-console/backend/integration-test/src/IntegrationTestBootstrap.kt b/mirai-console/backend/integration-test/src/IntegrationTestBootstrap.kt
index daae9b398..d721cd01f 100644
--- a/mirai-console/backend/integration-test/src/IntegrationTestBootstrap.kt
+++ b/mirai-console/backend/integration-test/src/IntegrationTestBootstrap.kt
@@ -56,6 +56,7 @@ internal fun main() {
ConsoleTerminalSettings.setupAnsi = false
ConsoleTerminalSettings.noConsole = true
+ ConsoleTerminalSettings.launchOptions.crashWhenPluginLoadFailed = true
val testUnits: List<AbstractTestPoint> = readStringListFromEnv("IT_POINTS").asSequence()
.onEach { println("[MCIT] Loading test point: $it") }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 19535a499..c6000eef3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -69,7 +69,7 @@ fun includeConsoleITPlugin(path: File) {
initScript.writeText(consoleIntegrationTestSubPluginBuildGradleKtsTemplate)
}
- val projectPath = ":mirai-console.integration-test.tp.${path.name}"
+ val projectPath = ":mirai-console.integration-test:${path.name}"
include(projectPath)
project(projectPath).projectDir = path
}