azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Fix library_mismatch test

Browse Source
This commit is contained in:
Ilya Matveev
2019-08-05 13:01:44 +07:00
committed by Ilya Matveev
parent 070e4a8b7d
commit 4eb7f0cf91
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
+9 -4
View File
@@ -206,8 +206,11 @@ task sanity {
update_external_tests() update_external_tests()
} }
} }
dependsOn(tasksOf(KonanTest.class, { (it instanceof KonanLocalTest || it instanceof KonanStandaloneTest) && dependsOn(tasksOf(KonanTest.class) {
!it.getDependsOn().contains(':distPlatformLibs') })) (it instanceof KonanLocalTest || it instanceof KonanStandaloneTest) &&
!it.getDependsOn().contains(':distPlatformLibs') &&
it.name != "library_mismatch" // This test requires the wasm32 stdlib which is unavailable during a sanity run.
})
dependsOn(tasksOf(KonanTest.class, { it instanceof KonanGTest })) dependsOn(tasksOf(KonanTest.class, { it instanceof KonanGTest }))
} }
@@ -3542,7 +3545,7 @@ dynamicTest("produce_dynamic") {
task library_mismatch(type: KonanDriverTest) { task library_mismatch(type: KonanDriverTest) {
// Does not work for cross targets yet. // Does not work for cross targets yet.
enabled = !(project.testTarget != null && project.testTarget != project.hostName) enabled = !(project.testTarget != null && project.target.name != project.hostName)
def dir = buildDir.absolutePath def dir = buildDir.absolutePath
def lib = "$projectDir/link/versioning/empty.kt" def lib = "$projectDir/link/versioning/empty.kt"
@@ -3551,7 +3554,9 @@ task library_mismatch(type: KonanDriverTest) {
def someOtherTarget = (project.testTarget == 'wasm32' ? project.hostName : 'wasm32') def someOtherTarget = (project.testTarget == 'wasm32' ? project.hostName : 'wasm32')
if (!useCustomDist) { if (!useCustomDist) {
dependsOn ':wasm32CrossDistRuntime' // we actually need any target other than the current one. // we actually need any target other than the current one.
dependsOn ':wasm32CrossDistRuntime'
dependsOn ':wasm32CrossDistEndorsedLibraries'
} }
doBefore { doBefore {