Skip to content

BTA: Distinguish typed argument values from raw string values in compatibility test descriptors #5878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ywett02 merged 2 commits into from
Apr 22, 2026
Merged

BTA: Distinguish typed argument values from raw string values in compatibility test descriptors #5878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
334ad90
[BTA] Add raw argument values support for backward compatibility tests
ywett02 Apr 16, 2026
1f8bba1
[BTA] Add raw argument values support for forward compatibility tests
ywett02 Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...lity-tests/src/testCompatibility/kotlin/arguments/CommonCompilerArgumentConversionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,12 @@ internal class CommonCompilerArgumentConversionTest : BaseCompilationTest() {
@DisplayName("Raw argument strings are converted to BTA argument")
fun <T> CommonArgumentConfiguration<T>.testRawArgumentStringsConversion() {
assumeArgumentSupported()
for (value in argumentValues) {
for (value in argumentRawValues) {
val operation = toolchain.jvm.createJvmCompilationOperation(emptyList(), Paths.get("."))

operation.compilerArguments.applyArgumentStrings(
expectedArgumentStringsFor(getValueString(value))
)
operation.compilerArguments.applyArgumentStrings(expectedArgumentStringsFor(value))

assertEquals(getValueString(value), getValueString(operation.compilerArguments[argumentKey]))
assertEquals(value, getValueString(operation.compilerArguments[argumentKey]))
}
}

Expand Down
8 changes: 3 additions & 5 deletions ...ibility-tests/src/testCompatibility/kotlin/arguments/JvmCompilerArgumentConversionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,12 @@ internal class JvmCompilerArgumentConversionTest : BaseCompilationTest() {
@DisplayName("Raw argument strings are converted to BTA argument")
fun <T> JvmArgumentConfiguration<T>.testRawArgumentStringsConversion() {
assumeArgumentSupported()
for (value in argumentValues) {
for (value in argumentRawValues) {
val operation = toolchain.jvm.createJvmCompilationOperation(emptyList(), Paths.get("."))

operation.compilerArguments.applyArgumentStrings(
expectedArgumentStringsFor(getValueString(value))
)
operation.compilerArguments.applyArgumentStrings(expectedArgumentStringsFor(value))

assertEquals(getValueString(value), getValueString(operation.compilerArguments[argumentKey]))
assertEquals(value, getValueString(operation.compilerArguments[argumentKey]))
}
}

Expand Down
1 change: 1 addition & 0 deletions ...ompatibility-tests/src/testCompatibility/kotlin/arguments/model/ArgumentTestDescriptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ internal interface ArgumentTestDescriptor<T> {
val argument: Any

val argumentValues: List<T>
val argumentRawValues: List<String>

val invalidArgumentValues: List<T>
val runsInvalidArgumentValueTest: Boolean
Expand Down
1 change: 1 addition & 0 deletions ...-tests/src/testCompatibility/kotlin/arguments/model/common/CommonArgumentConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ internal class CommonArgumentConfiguration<T>(
) : ArgumentConfiguration<T>(commonArgumentTestDescriptor) {
val argumentKey: CommonCompilerArgument<T> = commonArgumentTestDescriptor.argument
val argumentValues: List<T> = commonArgumentTestDescriptor.argumentValues
val argumentRawValues: List<String> = commonArgumentTestDescriptor.argumentRawValues

val invalidArgumentValues: List<T> = commonArgumentTestDescriptor.invalidArgumentValues
val invalidRawValues: List<String> = commonArgumentTestDescriptor.invalidRawValues
Expand Down
23 changes: 23 additions & 0 deletions ...lity-tests/src/testCompatibility/kotlin/arguments/model/common/CommonArgumentProviders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,118 +66,141 @@ internal val commonCompilerArgumentTestDescriptors: List<CommonArgumentTestDescr
argumentName = "opt-in",
argument = OPT_IN,
argumentValues = listOf(arrayOf("kotlin.RequiresOptIn", "kotlin.ExperimentalStdlibApi", "kotlin.time.ExperimentalTime")),
argumentRawValues = listOf(
arrayOf(
"kotlin.RequiresOptIn",
"kotlin.ExperimentalStdlibApi",
"kotlin.time.ExperimentalTime"
).joinToString(",")
),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-opt-in", value) },
),
CommonArgumentTestDescriptor(
argumentName = "kotlin-home",
argument = KOTLIN_HOME,
argumentValues = listOf(testBaseDir.resolve("path/to/kotlin").toFile().absolutePath),
argumentRawValues = listOf(testBaseDir.resolve("path/to/kotlin").toFile().absolutePath),
valueString = { value -> value },
expectedArgumentStringsFor = { value -> listOf("-kotlin-home", value) },
),
CommonArgumentTestDescriptor(
argumentName = "Xverbose-phases",
argument = X_VERBOSE_PHASES,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xverbose-phases=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xdisable-phases",
argument = X_DISABLE_PHASES,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xdisable-phases=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xsuppress-warning",
argument = X_SUPPRESS_WARNING,
argumentValues = listOf(arrayOf("warning1", "warning2", "warning3")),
argumentRawValues = listOf(arrayOf("warning1", "warning2", "warning3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xsuppress-warning=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xannotation-default-target",
argument = X_ANNOTATION_DEFAULT_TARGET,
argumentValues = listOf("first-only", "first-only-warn", "param-property"),
argumentRawValues = listOf("first-only", "first-only-warn", "param-property"),
valueString = { value -> value },
expectedArgumentStringsFor = { value -> listOf("-Xannotation-default-target=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xverify-ir",
argument = X_VERIFY_IR,
argumentValues = listOf("none", "warning", "error"),
argumentRawValues = listOf("none", "warning", "error"),
valueString = { value -> value },
expectedArgumentStringsFor = { value -> listOf("-Xverify-ir=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xname-based-destructuring",
argument = X_NAME_BASED_DESTRUCTURING,
argumentValues = listOf("only-syntax", "name-mismatch", "complete"),
argumentRawValues = listOf("only-syntax", "name-mismatch", "complete"),
valueString = { value -> value },
expectedArgumentStringsFor = { value -> listOf("-Xname-based-destructuring=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xphases-to-dump",
argument = X_PHASES_TO_DUMP,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xphases-to-dump=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xphases-to-dump-before",
argument = X_PHASES_TO_DUMP_BEFORE,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xphases-to-dump-before=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xphases-to-dump-after",
argument = X_PHASES_TO_DUMP_AFTER,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xphases-to-dump-after=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xphases-to-validate",
argument = X_PHASES_TO_VALIDATE,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xphases-to-validate=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xphases-to-validate-before",
argument = X_PHASES_TO_VALIDATE_BEFORE,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xphases-to-validate-before=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xphases-to-validate-after",
argument = X_PHASES_TO_VALIDATE_AFTER,
argumentValues = listOf(arrayOf("phase1", "phase2", "phase3")),
argumentRawValues = listOf(arrayOf("phase1", "phase2", "phase3").joinToString(",")),
valueString = { value -> value?.joinToString(",") },
expectedArgumentStringsFor = { value -> listOf("-Xphases-to-validate-after=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xdump-directory",
argument = X_DUMP_DIRECTORY,
argumentValues = listOf(testBaseDir.resolve("path/to/dump").toFile().absolutePath),
argumentRawValues = listOf(testBaseDir.resolve("path/to/dump").toFile().absolutePath),
valueString = { value -> value },
expectedArgumentStringsFor = { value -> listOf("-Xdump-directory=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xdump-perf",
argument = X_DUMP_PERF,
argumentValues = listOf(testBaseDir.resolve("path/to/perf.log").toFile().absolutePath),
argumentRawValues = listOf(testBaseDir.resolve("path/to/perf.log").toFile().absolutePath),
valueString = { value -> value },
expectedArgumentStringsFor = { value -> listOf("-Xdump-perf=$value") },
),
CommonArgumentTestDescriptor(
argumentName = "Xwarning-level",
argument = X_WARNING_LEVEL,
argumentValues = listOf(arrayOf("DEPRECATION:error", "UNUSED_VARIABLE:disabled")),
argumentRawValues = listOf(arrayOf("DEPRECATION:error", "UNUSED_VARIABLE:disabled").joinToString(",")),
invalidArgumentValues = listOf(arrayOf("DEPRECATION:non-existent-level")),
invalidRawValues = listOf("DEPRECATION:non-existent-level"),
valueString = { value -> value?.joinToString(",") },
Expand Down
1 change: 1 addition & 0 deletions ...tests/src/testCompatibility/kotlin/arguments/model/common/CommonArgumentTestDescriptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ internal class CommonArgumentTestDescriptor<T>(
override val argumentName: String,
override val argument: CommonCompilerArguments.CommonCompilerArgument<T>,
override val argumentValues: List<T>,
override val argumentRawValues: List<String>,
override val invalidArgumentValues: List<T> = emptyList(),
override val invalidRawValues: List<String> = emptyList(),
val valueString: (T?) -> String?,
Expand Down
1 change: 1 addition & 0 deletions ...bility-tests/src/testCompatibility/kotlin/arguments/model/jvm/JvmArgumentConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ internal class JvmArgumentConfiguration<T>(
) : ArgumentConfiguration<T>(jvmArgumentTestDescriptor) {
val argumentKey: JvmCompilerArgument<T> = jvmArgumentTestDescriptor.argument
val argumentValues: List<T> = jvmArgumentTestDescriptor.argumentValues
val argumentRawValues: List<String> = jvmArgumentTestDescriptor.argumentRawValues

val invalidArgumentValues: List<T> = jvmArgumentTestDescriptor.invalidArgumentValues
val invalidRawValues: List<String> = jvmArgumentTestDescriptor.invalidRawValues
Expand Down
Loading