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

gradle-plugin, tests: Enable ignored library tests

Browse Source
This commit is contained in:
Ilya Matveev
2017-11-13 16:57:36 +07:00
committed by ilmat192
parent 3c6bcb9244
commit b96ede81d2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
+1 -1
View File
@@ -141,7 +141,7 @@ class KonanProject {
|plugins { id 'konan' } |plugins { id 'konan' }
| |
|konan.targets = [${targets.collect { "'$it'" }.join(", ")}] |konan.targets = [${targets.collect { "'$it'" }.join(", ")}]
""".stripMargin() |""".stripMargin()
) )
compilationTasks = [":compileKonan", ":build"] compilationTasks = [":compileKonan", ":build"]
return result return result
tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/LibrarySpecification.groovy
+6 -4
View File
@@ -234,7 +234,6 @@ class LibrarySpecification extends BaseKonanSpecification {
.build() .build()
} }
@Ignore // TODO: Ignored due to an error with recursive klibs
def 'Plugin should support library dependencies in the same project'() { def 'Plugin should support library dependencies in the same project'() {
expect: expect:
def project = KonanProject.createEmpty(projectDirectory) { KonanProject it -> def project = KonanProject.createEmpty(projectDirectory) { KonanProject it ->
@@ -255,7 +254,6 @@ class LibrarySpecification extends BaseKonanSpecification {
.build() .build()
} }
@Ignore // TODO: Ignored due to an error with recursive klibs
def 'Plugin should support library dependencies from other projects'() { def 'Plugin should support library dependencies from other projects'() {
expect: expect:
def project = KonanProject.createEmpty(projectDirectory) def project = KonanProject.createEmpty(projectDirectory)
@@ -272,11 +270,15 @@ class LibrarySpecification extends BaseKonanSpecification {
subproject2.addCompilerArtifact("bar", "fun bar() { println(43) }", ArtifactType.LIBRARY) subproject2.addCompilerArtifact("bar", "fun bar() { println(43) }", ArtifactType.LIBRARY)
subproject2.addSetting("bar", "noDefaultLibs", "true") subproject2.addSetting("bar", "noDefaultLibs", "true")
subproject2.addLibraryToArtifact("bar", "rootProject.project('subproject1'), foo") subproject2.addLibraryToArtifactCustom(
"bar", "artifact rootProject.project('subproject1'), 'foo'"
)
project.addCompilerArtifact("main" ,"fun main(args: Array<String>) { foo(); bar() }") project.addCompilerArtifact("main" ,"fun main(args: Array<String>) { foo(); bar() }")
project.addSetting("main", "noDefaultLibs", "true" ) project.addSetting("main", "noDefaultLibs", "true" )
project.addLibraryToArtifact("main", "project(subproject2), bar") project.addLibraryToArtifactCustom(
"main", "artifact project('subproject2'), 'bar'"
)
project.createRunner() project.createRunner()
.withArguments(KonanProject.compilationTask("main")) .withArguments(KonanProject.compilationTask("main"))