From 8e200d8113d6be1a17fc32b325e033446a011007 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 25 Apr 2019 14:18:38 +0300 Subject: [PATCH] Filter out self output directory from classpath in FIR modularized test --- .../kotlin/fir/FirResolveModularizedTotalKotlinTest.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt index 44334b527d3..fcd80ba57d1 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt @@ -159,7 +159,10 @@ class FirResolveModularizedTotalKotlinTest : KtUsefulTestCase() { val item = moduleElement.childNodes.item(index) if (item.nodeName == "classpath") { - classpath += File(item.attributes.getNamedItem("path").nodeValue) + val path = item.attributes.getNamedItem("path").nodeValue + if (path != outputDir) { + classpath += File(path) + } } if (item.nodeName == "javaSourceRoots") { javaSourceRoots += File(item.attributes.getNamedItem("path").nodeValue)