From 1efd859909f5d6abc99d3f8381f38b6fad467d70 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 16 Jan 2019 00:27:28 +0300 Subject: [PATCH] Exclude protobuf-relocated build directory in CodeConformanceTest #KT-29202 --- .../tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 4e99bebbd09..a24d0107679 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -49,7 +49,8 @@ class CodeConformanceTest : TestCase() { "libraries/tools/kotlinp/src", "compiler/testData/psi/kdoc", "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", - "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java" + "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java", + "custom-dependencies/protobuf/protobuf-relocated/build" ).map(::File) private val COPYRIGHT_EXCLUDED_FILES_AND_DIRS = listOf( @@ -57,6 +58,7 @@ class CodeConformanceTest : TestCase() { "out", "dist", "custom-dependencies/android-sdk/build", + "custom-dependencies/protobuf/protobuf-relocated/build", "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", "idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright", "js/js.tests/.gradle",