diff --git a/build.gradle.kts b/build.gradle.kts index e26edb76cf8..36d7fa32e79 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -719,7 +719,7 @@ tasks { register("coreLibsTest") { (coreLibProjects + listOfNotNull( ":kotlin-stdlib:samples", - ":kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, + ":kotlin-test:kotlin-test-js-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync }, ":kotlinx-metadata-jvm", ":tools:binary-compatibility-validator", ":tools:jdk-api-validator", diff --git a/libraries/kotlin.test/js-ir/it/package.json b/libraries/kotlin.test/js-ir/it/package.json deleted file mode 100644 index f606e188cc2..00000000000 --- a/libraries/kotlin.test/js-ir/it/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "scripts": { - "test-jasmine": "jasmine build/jsSources/jasmine-reporter.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js", - "test-jest": "jest", - "test-mocha": "mocha --reporter build/jsSources/mocha-reporter.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js", - "test-qunit": "qunit --require ./build/jsSources/qunit-reporter.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js", - "test-tape": "tape build/jsSources/tape-reporter.js build/jsSources/tape-plugin.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js" - }, - "devDependencies": { - "jasmine": "^3.10.0", - "jest": "^29.5.0", - "mocha": "^9.2.1", - "qunit": "^2.18.2", - "tape": "~4.10.0" - }, - "jest": { - "testResultsProcessor": "/build/jsSources/jest-reporter.js", - "testRegex": "-test\\.js$" - } -} diff --git a/libraries/kotlin.test/js-ir/it/.gitignore b/libraries/kotlin.test/js/it/.gitignore similarity index 100% rename from libraries/kotlin.test/js-ir/it/.gitignore rename to libraries/kotlin.test/js/it/.gitignore diff --git a/libraries/kotlin.test/js-ir/it/build.gradle.kts b/libraries/kotlin.test/js/it/build.gradle.kts similarity index 86% rename from libraries/kotlin.test/js-ir/it/build.gradle.kts rename to libraries/kotlin.test/js/it/build.gradle.kts index 34cd401e22d..9966b674527 100644 --- a/libraries/kotlin.test/js-ir/it/build.gradle.kts +++ b/libraries/kotlin.test/js/it/build.gradle.kts @@ -8,6 +8,7 @@ import java.io.FileOutputStream plugins { kotlin("js") alias(libs.plugins.gradle.node) + idea } description = "Kotlin-test integration tests for JS IR" @@ -17,14 +18,8 @@ node { download.set(true) } -val jsMainSources by task { - from("$rootDir/libraries/kotlin.test/js/it/src") - into(layout.buildDirectory.dir("jsMainSources")) -} - -val jsSources by task { - from("$rootDir/libraries/kotlin.test/js/it/js") - into(layout.buildDirectory.dir("jsSources")) +idea { + module.excludeDirs.add(file("node_modules")) } val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures) @@ -32,16 +27,14 @@ val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures kotlin { js(IR) { nodejs { - testTask(Action { + testTask { enabled = false - }) + } } } sourceSets { - named("test") { - kotlin.srcDir(jsMainSources.get().destinationDir) - } + } } @@ -56,7 +49,7 @@ val nodeModules by configurations.registering { } val compileTestDevelopmentExecutableKotlinJs = tasks.named("compileTestDevelopmentExecutableKotlinJs") { - compilerOptions.moduleName = "kotlin-kotlin-test-js-ir-it-test" + compilerOptions.moduleName = "kotlin-kotlin-test-js-it-test" } val populateNodeModules = tasks.register("populateNodeModules") { @@ -128,7 +121,3 @@ dependencies { api(project(":kotlin-test")) } -tasks.named("compileTestKotlinJs") { - dependsOn(jsMainSources) - dependsOn(jsSources) -} diff --git a/libraries/kotlin.test/js-ir/it/gradle.properties b/libraries/kotlin.test/js/it/gradle.properties similarity index 100% rename from libraries/kotlin.test/js-ir/it/gradle.properties rename to libraries/kotlin.test/js/it/gradle.properties diff --git a/libraries/kotlin.test/js-ir/it/package-lock.json b/libraries/kotlin.test/js/it/package-lock.json similarity index 100% rename from libraries/kotlin.test/js-ir/it/package-lock.json rename to libraries/kotlin.test/js/it/package-lock.json diff --git a/libraries/kotlin.test/js/it/package.json b/libraries/kotlin.test/js/it/package.json new file mode 100644 index 00000000000..4e32953d8b6 --- /dev/null +++ b/libraries/kotlin.test/js/it/package.json @@ -0,0 +1,20 @@ +{ + "scripts": { + "test-jasmine": "jasmine js/jasmine-reporter.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-it-test.js", + "test-jest": "jest", + "test-mocha": "mocha --reporter js/mocha-reporter.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-it-test.js", + "test-qunit": "qunit --require ./js/qunit-reporter.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-it-test.js", + "test-tape": "tape js/tape-reporter.js js/tape-plugin.js build/compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-it-test.js" + }, + "devDependencies": { + "jasmine": "^3.10.0", + "jest": "^29.5.0", + "mocha": "^9.2.1", + "qunit": "^2.18.2", + "tape": "~4.10.0" + }, + "jest": { + "testResultsProcessor": "/js/jest-reporter.js", + "testRegex": "-test\\.js$" + } +} diff --git a/settings.gradle b/settings.gradle index 747c1a64fbc..726ec5b6cf6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -634,7 +634,7 @@ if (buildProperties.inJpsBuildIdeaSync) { ":tools:kotlin-stdlib-gen", ":kotlin-test", - ":kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it", + ":kotlin-test:kotlin-test-js-it", ":native:native.tests" project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File @@ -652,7 +652,7 @@ if (buildProperties.inJpsBuildIdeaSync) { project(':tools:ide-plugin-dependencies-validator').projectDir = "$rootDir/libraries/tools/ide-plugin-dependencies-validator" as File project(':kotlin-test').projectDir = "$rootDir/libraries/kotlin.test" as File - project(':kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it').projectDir = "$rootDir/libraries/kotlin.test/js-ir/it" as File + project(':kotlin-test:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File project(':native:native.tests').projectDir = "$rootDir/native/native.tests" as File } include ":compiler:android-tests"