[Gradle, JS] Remove browser tests from gradle integration tests

This commit is contained in:
Ilya Goncharov
2020-05-21 16:03:32 +03:00
parent 6e3d3831c2
commit 104352b313
4 changed files with 5 additions and 18 deletions
@@ -1,11 +1,14 @@
/* /*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.gradle package org.jetbrains.kotlin.gradle
import org.jdom.input.SAXBuilder import org.jdom.input.SAXBuilder
import org.jetbrains.kotlin.gradle.internals.* import org.jetbrains.kotlin.gradle.internals.DISABLED_NATIVE_TARGETS_REPORTER_DISABLE_WARNING_PROPERTY_NAME
import org.jetbrains.kotlin.gradle.internals.DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX
import org.jetbrains.kotlin.gradle.internals.NO_NATIVE_STDLIB_PROPERTY_WARNING
import org.jetbrains.kotlin.gradle.internals.NO_NATIVE_STDLIB_WARNING
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.* import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.*
import org.jetbrains.kotlin.gradle.plugin.ProjectLocalConfigurations import org.jetbrains.kotlin.gradle.plugin.ProjectLocalConfigurations
@@ -720,7 +723,6 @@ class NewMultiplatformIT : BaseGradleIT() {
assertTestResults( assertTestResults(
"testProject/new-mpp-lib-with-tests/TEST-all.xml", "testProject/new-mpp-lib-with-tests/TEST-all.xml",
"jsBrowserTest",
"jsNodeTest", "jsNodeTest",
"test", // jvmTest "test", // jvmTest
"${nativeHostTargetName}Test" "${nativeHostTargetName}Test"
@@ -7,13 +7,6 @@
<system-out /> <system-out />
<system-err /> <system-err />
</testsuite> </testsuite>
<testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
<properties />
<testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." />
<testcase name="testExpectedFun" classname="com.example.lib.TestCommonCode" time="..." />
<system-out />
<system-err />
</testsuite>
<testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="..."> <testsuite name="com.example.lib.TestCommonCode" tests="2" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
<properties /> <properties />
<testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." /> <testcase name="testId" classname="com.example.lib.TestCommonCode" time="..." />
@@ -40,12 +33,6 @@
<system-out /> <system-out />
<system-err /> <system-err />
</testsuite> </testsuite>
<testsuite name="com.example.lib.TestJs" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
<properties />
<testcase name="testJsSpecificCode" classname="com.example.lib.TestJs" time="..." />
<system-out />
<system-err />
</testsuite>
<testsuite name="com.example.lib.TestWithJava" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="..."> <testsuite name="com.example.lib.TestWithJava" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
<properties /> <properties />
<testcase name="testJavaClass" classname="com.example.lib.TestWithJava" time="..." /> <testcase name="testJavaClass" classname="com.example.lib.TestWithJava" time="..." />
@@ -29,7 +29,6 @@ kotlin {
} }
js { js {
browser()
nodejs() nodejs()
} }
@@ -12,7 +12,6 @@ kotlin {
val jvmWithoutJava = jvm("jvmWithoutJava") val jvmWithoutJava = jvm("jvmWithoutJava")
val jvmWithJava = targetFromPreset(presets["jvmWithJava"]) val jvmWithJava = targetFromPreset(presets["jvmWithJava"])
val js = js { val js = js {
browser()
nodejs() nodejs()
} }
val macos64 = macosX64("macos64") val macos64 = macosX64("macos64")