[AA] Fix compilation facility "multi binary module" test module structure

- The module structure for these tests was set up backwards: We should
  keep the test module kind of the main module flexible (as it is
  configured by test configurators), but keep the module kinds of the
  binary libraries fixed.

^KT-65960
^KT-64994
This commit is contained in:
Marco Pennekamp
2024-02-26 16:37:39 +01:00
committed by Space Team
parent 4ea3de1760
commit b5eccd63b1
17 changed files with 43 additions and 95 deletions
@@ -1,16 +1,19 @@
// MODULE: lib
// MODULE_KIND: LibraryBinary
// FILE: p3/foo.kt
package p3;
package p3
fun foo() = 3
// MODULE: lib2(lib)
// MODULE_KIND: LibraryBinary
// FILE: p2/bar.kt
package p2;
package p2
fun bar() = 4 + p3.foo()
// MODULE: main(lib, lib2)
// MODULE_KIND: Source
// FILE: main.kt
import p2.bar
fun test() = bar()
fun test() = bar()
@@ -1,4 +1,5 @@
// MODULE: lib
// MODULE_KIND: LibraryBinary
// FILE: p3/Anno.java
package p3;
@@ -13,7 +14,9 @@ import static java.lang.annotation.ElementType.*;
public @interface Anno {
String[] value();
}
// MODULE: lib2(lib)
// MODULE_KIND: LibraryBinary
// FILE: p2/Parent.java
package p2;
@@ -27,8 +30,8 @@ public class Parent {
public void setContentView(@Anno({"UnknownNullness", "MissingNullability"}) int id) {
}
}
// MODULE: main(lib, lib2)
// MODULE_KIND: Source
// FILE: main.kt
import p2.Parent
@@ -39,4 +42,4 @@ class Child: Parent() {
}
private fun bar() {}
}
}
@@ -3,4 +3,4 @@ public final class Child {
public method <init>(): void
private final method bar(): void
protected method onCreate(): void
}
}
@@ -2,9 +2,9 @@
// DUMP_IR
// MODULE: lib
// MODULE_KIND: LibraryBinary
// FILE: p3/foo.kt
package p3;
package p3
import org.jetbrains.kotlin.fir.plugin.MyComposable
@@ -14,9 +14,7 @@ public fun Foo(
) {}
// MODULE: main(lib)
// MODULE_KIND: Source
// FILE: main.kt
import org.jetbrains.kotlin.fir.plugin.MyComposable
import p3.Foo
@@ -25,4 +23,4 @@ public fun Bar() {
Foo(
text = {}, // @Composable invocations can only happen from the context of a @Composable function
)
}
}
@@ -2,9 +2,9 @@
// DUMP_IR
// MODULE: lib
// MODULE_KIND: LibraryBinary
// FILE: p3/foo.kt
package p3;
package p3
import org.jetbrains.kotlin.fir.plugin.MyComposable
@@ -14,9 +14,7 @@ fun setContent(content: @MyComposable () -> Unit): Int {
}
// MODULE: main(lib)
// MODULE_KIND: Source
// FILE: main.kt
import org.jetbrains.kotlin.fir.plugin.MyComposable
import p3.setContent
@@ -31,4 +29,4 @@ fun Greeting(name: String) {
show("hi $name!")
}
fun show(str: String) {}
fun show(str: String) {}