From dd9f702516604478c60191d6677fa0ffa43e2eb4 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 26 Jan 2024 15:29:04 +0100 Subject: [PATCH] [K/N][tests] Make InfrastructureDumpedTestListingTest run on other targets --- .../test/blackbox/InfrastructureDumpedTestListingTest.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt index a2bcbed0281..64d6b3ce1ec 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt @@ -9,7 +9,6 @@ import com.intellij.openapi.util.text.StringUtil.convertLineSeparators import com.intellij.testFramework.TestDataFile import com.intellij.testFramework.TestDataPath import org.jetbrains.kotlin.konan.test.blackbox.InfrastructureDumpedTestListingTest.Companion.TEST_SUITE_PATH -import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.Executable import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB @@ -18,6 +17,7 @@ import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilat import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Success import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.executor import org.jetbrains.kotlin.konan.test.blackbox.support.util.DumpedTestListing import org.jetbrains.kotlin.konan.test.blackbox.support.util.GTestListing import org.jetbrains.kotlin.native.executors.runProcess @@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test import java.io.File @Tag("infrastructure") -@EnforcedHostTarget @TestMetadata(TEST_SUITE_PATH) @TestDataPath("\$PROJECT_ROOT") class InfrastructureDumpedTestListingTest : AbstractNativeSimpleTest() { @@ -82,7 +81,7 @@ class InfrastructureDumpedTestListingTest : AbstractNativeSimpleTest() { // parse test listing obtained from executable file with the help of --ktest_list_tests flag: val testExecutable = TestExecutable.fromCompilationResult(executableTestCase, executableCompilationSuccess) val extractedTestListing = with (testRunSettings) { - val listing = runProcess(testExecutable.executable.executableFile.absolutePath, "--ktest_list_tests") { + val listing = executor.runProcess(testExecutable.executable.executableFile.absolutePath, "--ktest_list_tests") { timeout = get().executionTimeout }.stdout GTestListing.parse(listing).toSet()