azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][tests] Make InfrastructureDumpedTestListingTest run on other targets

Browse Source
This commit is contained in:
Alexander Shabalin
2024-01-26 15:29:04 +01:00
committed by Space Team
parent f0c9033205
commit dd9f702516
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt
+2 -3
View File
@@ -9,7 +9,6 @@ import com.intellij.openapi.util.text.StringUtil.convertLineSeparators
import com.intellij.testFramework.TestDataFile import com.intellij.testFramework.TestDataFile
import com.intellij.testFramework.TestDataPath import com.intellij.testFramework.TestDataPath
import org.jetbrains.kotlin.konan.test.blackbox.InfrastructureDumpedTestListingTest.Companion.TEST_SUITE_PATH 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.TestCase
import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.Executable import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.Executable
import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB 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.compilation.TestCompilationResult.Success
import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable 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.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.DumpedTestListing
import org.jetbrains.kotlin.konan.test.blackbox.support.util.GTestListing import org.jetbrains.kotlin.konan.test.blackbox.support.util.GTestListing
import org.jetbrains.kotlin.native.executors.runProcess import org.jetbrains.kotlin.native.executors.runProcess
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test
import java.io.File import java.io.File
@Tag("infrastructure") @Tag("infrastructure")
@EnforcedHostTarget
@TestMetadata(TEST_SUITE_PATH) @TestMetadata(TEST_SUITE_PATH)
@TestDataPath("\$PROJECT_ROOT") @TestDataPath("\$PROJECT_ROOT")
class InfrastructureDumpedTestListingTest : AbstractNativeSimpleTest() { 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: // parse test listing obtained from executable file with the help of --ktest_list_tests flag:
val testExecutable = TestExecutable.fromCompilationResult(executableTestCase, executableCompilationSuccess) val testExecutable = TestExecutable.fromCompilationResult(executableTestCase, executableCompilationSuccess)
val extractedTestListing = with (testRunSettings) { 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<Timeouts>().executionTimeout timeout = get<Timeouts>().executionTimeout
}.stdout }.stdout
GTestListing.parse(listing).toSet() GTestListing.parse(listing).toSet()