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

Scripting: refactor test infrastructure - add missing stderr handling

Browse Source
This commit is contained in:
Ilya Chernikov
2023-11-09 12:25:36 +01:00
committed by Space Team
parent e927ac5fc3
commit a47ee44e65
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsIT.kt
+4 -2
View File
@@ -163,12 +163,13 @@ class MainKtsIT {
fun runWithKotlincAndMainKts(
scriptPath: String,
expectedOutPatterns: List<String> = emptyList(),
expectedErrPatterns: List<String> = emptyList(),
expectedExitCode: Int = 0,
cacheDir: Path? = null
) {
val paths = PathUtil.kotlinPathsForDistDirectory
runWithKotlinc(
scriptPath, expectedOutPatterns, expectedExitCode,
scriptPath, expectedOutPatterns, expectedErrPatterns, expectedExitCode,
classpath = listOf(
paths.jar(KotlinPaths.Jar.MainKts).also {
Assert.assertTrue("kotlin-main-kts.jar not found, run dist task: ${it.absolutePath}", it.exists())
@@ -181,12 +182,13 @@ fun runWithKotlincAndMainKts(
fun runWithKotlinRunner(
scriptPath: String,
expectedOutPatterns: List<String> = emptyList(),
expectedErrPatterns: List<String> = emptyList(),
expectedExitCode: Int = 0,
cacheDir: Path? = null,
expectErrorOnK2: Boolean = false
) {
runWithKotlinLauncherScript(
"kotlin", listOf(scriptPath), expectedOutPatterns, expectedExitCode,
"kotlin", listOf(scriptPath), expectedOutPatterns, expectedErrPatterns, expectedExitCode,
additionalEnvVars = listOf(COMPILED_SCRIPTS_CACHE_DIR_ENV_VAR to (cacheDir?.toAbsolutePath()?.toString() ?: "")),
expectErrorOnK2 = expectErrorOnK2
)
libraries/tools/kotlin-main-kts-test/test/org/jetbrains/kotlin/mainKts/test/mainKtsTest.kt
+9 -2
View File
@@ -403,17 +403,24 @@ class CacheDirectoryDetectorTest {
private val directories = Directories(systemProperties, environment)
}
internal fun captureOut(body: () -> Unit): String {
internal fun captureOut(body: () -> Unit): String = captureOutAndErr(body).first
internal fun captureOutAndErr(body: () -> Unit): Pair<String, String> {
val outStream = ByteArrayOutputStream()
val errStream = ByteArrayOutputStream()
val prevOut = System.out
val prevErr = System.err
System.setOut(PrintStream(outStream))
System.setErr(PrintStream(errStream))
try {
body()
} finally {
System.out.flush()
System.err.flush()
System.setOut(prevOut)
System.setErr(prevErr)
}
return outStream.toString().trim()
return outStream.toString().trim() to errStream.toString().trim()
}
internal fun <T> withProperty(name: String, value: String?, body: () -> T): T {