From 0f7a9c44b4343cf0484cbbfb03a0d7e188dd6fe7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 10 Apr 2020 16:43:17 +0300 Subject: [PATCH] Minor: sort excluded files and dirs in conformance test --- .../kotlin/code/CodeConformanceTest.kt | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 331d58f19ae..538f93780f4 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -30,71 +30,71 @@ class CodeConformanceTest : TestCase() { private const val MAX_STEPS_COUNT = 100 private val EXCLUDED_FILES_AND_DIRS = listOf( "buildSrc", - "core/reflection.jvm/src/kotlin/reflect/jvm/internal/pcollections", - "js/js.tests/.gradle", - "js/js.translator/testData/node_modules", - "libraries/kotlin.test/js/it/.gradle", - "libraries/kotlin.test/js/it/node_modules", - "libraries/stdlib/js-v1/.gradle", - "libraries/stdlib/js-v1/build", - "libraries/stdlib/js-ir/.gradle", - "libraries/stdlib/js-ir/build", - "libraries/reflect/build", - "libraries/reflect/api/src/java9/java/kotlin/reflect/jvm/internal/impl", - "libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools", - "dependencies", - "js/js.translator/qunit/qunit.js", - "libraries/tools/kotlin-js-tests/src/test/web/qunit.js", - "out", - "dist", - "libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp", - "libraries/tools/kotlin-maven-plugin/target", - "libraries/tools/kotlinp/src", - "libraries/tools/kotlin-test-js-runner/node_modules", - "libraries/tools/kotlin-test-js-runner/.gradle", - "libraries/tools/kotlin-test-js-runner/lib", - "libraries/tools/kotlin-test-nodejs-runner/node_modules", - "libraries/tools/kotlin-test-nodejs-runner/.gradle", - "libraries/tools/kotlin-source-map-loader/node_modules", - "libraries/tools/kotlin-source-map-loader/.gradle", - "libraries/tools/kotlin-source-map-loader/lib", + "compiler/fir/lightTree/testData", "compiler/testData/psi/kdoc", "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java", + "core/reflection.jvm/src/kotlin/reflect/jvm/internal/pcollections", + "dependencies", "dependencies/protobuf/protobuf-relocated/build", - "compiler/fir/lightTree/testData", - "idea/testData/codeInsight/renderingKDoc" + "dist", + "idea/testData/codeInsight/renderingKDoc", + "js/js.tests/.gradle", + "js/js.translator/qunit/qunit.js", + "js/js.translator/testData/node_modules", + "libraries/kotlin.test/js/it/.gradle", + "libraries/kotlin.test/js/it/node_modules", + "libraries/reflect/api/src/java9/java/kotlin/reflect/jvm/internal/impl", + "libraries/reflect/build", + "libraries/stdlib/js-ir/.gradle", + "libraries/stdlib/js-ir/build", + "libraries/stdlib/js-v1/.gradle", + "libraries/stdlib/js-v1/build", + "libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools", + "libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp", + "libraries/tools/kotlin-js-tests/src/test/web/qunit.js", + "libraries/tools/kotlin-maven-plugin/target", + "libraries/tools/kotlin-source-map-loader/.gradle", + "libraries/tools/kotlin-source-map-loader/lib", + "libraries/tools/kotlin-source-map-loader/node_modules", + "libraries/tools/kotlin-test-js-runner/.gradle", + "libraries/tools/kotlin-test-js-runner/lib", + "libraries/tools/kotlin-test-js-runner/node_modules", + "libraries/tools/kotlin-test-nodejs-runner/.gradle", + "libraries/tools/kotlin-test-nodejs-runner/node_modules", + "libraries/tools/kotlinp/src", + "out" ).map(::File) private val COPYRIGHT_EXCLUDED_FILES_AND_DIRS = listOf( + "buildSrc/prepare-deps/build", + "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", "dependencies", - "out", - "dist", "dependencies/android-sdk/build", "dependencies/protobuf/protobuf-relocated/build", - "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", + "dist", "idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright", "js/js.tests/.gradle", "js/js.translator/testData/node_modules", - "libraries/stdlib/common/build", - "libraries/stdlib/js-v1/.gradle", - "libraries/stdlib/js-v1/build", - "libraries/stdlib/js-ir/.gradle", - "libraries/stdlib/js-ir/build", - "libraries/stdlib/js-ir/runtime/longjs.kt", "libraries/kotlin.test/js/it/.gradle", "libraries/kotlin.test/js/it/node_modules", + "libraries/stdlib/common/build", + "libraries/stdlib/js-ir/.gradle", + "libraries/stdlib/js-ir/build", + "libraries/stdlib/js-ir/build/", + "libraries/stdlib/js-ir/runtime/longjs.kt", + "libraries/stdlib/js-v1/.gradle", + "libraries/stdlib/js-v1/build", "libraries/stdlib/js-v1/node_modules", - "libraries/tools/kotlin-maven-plugin-test/target", "libraries/tools/kotlin-gradle-plugin-integration-tests/build", - "libraries/tools/kotlin-test-js-runner/node_modules", - "libraries/tools/kotlin-test-js-runner/.gradle", - "libraries/tools/kotlin-test-js-runner/lib", - "libraries/tools/kotlin-source-map-loader/node_modules", + "libraries/tools/kotlin-maven-plugin-test/target", "libraries/tools/kotlin-source-map-loader/.gradle", "libraries/tools/kotlin-source-map-loader/lib", - "buildSrc/prepare-deps/build", - "libraries/stdlib/js-ir/build/" + "libraries/tools/kotlin-source-map-loader/node_modules", + "libraries/tools/kotlin-test-js-runner/.gradle", + "libraries/tools/kotlin-test-js-runner/lib", + "libraries/tools/kotlin-test-js-runner/node_modules", + "out" ) }