From 9b2e6077f18dd3bf2da69b6a27585edd1609ad1e Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Thu, 25 Jun 2026 12:58:27 +0200 Subject: [PATCH] Kotlin: Address review comments --- .../kotlin/all-platforms/enhanced-nullability/test.py | 2 +- .../kotlin/all-platforms/external-property-overloads/test.py | 4 ++-- .../all-platforms/extractor_information_kotlin1/test.py | 2 +- .../kotlin/all-platforms/file_classes/test.py | 4 ++-- .../all-platforms/java-interface-redeclares-tostring/test.py | 2 +- .../all-platforms/kotlin_java_lowering_wildcards/test.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.py b/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.py index ee985f6de57..e6aa92cfc29 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.py +++ b/java/ql/integration-tests/kotlin/all-platforms/enhanced-nullability/test.py @@ -6,6 +6,6 @@ def test(codeql, java_full, kotlinc_2_3_20): codeql.database.create( command=[ f"javac {java_srcs} -d build", - f"{kotlinc_2_3_20} -language-version 1.9 user.kt -cp build", + "kotlinc -language-version 1.9 user.kt -cp build", ] ) diff --git a/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.py b/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.py index ca6aa65e8af..d21c0541cf4 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.py +++ b/java/ql/integration-tests/kotlin/all-platforms/external-property-overloads/test.py @@ -2,5 +2,5 @@ import commands def test(codeql, java_full, kotlinc_2_3_20): - commands.run(f"{kotlinc_2_3_20} -language-version 1.9 test.kt -d lib") - codeql.database.create(command=f"{kotlinc_2_3_20} -language-version 1.9 user.kt -cp lib") + commands.run("kotlinc -language-version 1.9 test.kt -d lib") + codeql.database.create(command="kotlinc -language-version 1.9 user.kt -cp lib") diff --git a/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/test.py b/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/test.py index 8da2eacc720..eea3fcbf549 100755 --- a/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/test.py +++ b/java/ql/integration-tests/kotlin/all-platforms/extractor_information_kotlin1/test.py @@ -1,2 +1,2 @@ def test(codeql, java_full, kotlinc_2_3_20): - codeql.database.create(command=f"{kotlinc_2_3_20} -J-Xmx2G -language-version 1.9 SomeClass.kt") + codeql.database.create(command=f"kotlinc -J-Xmx2G -language-version 1.9 SomeClass.kt") diff --git a/java/ql/integration-tests/kotlin/all-platforms/file_classes/test.py b/java/ql/integration-tests/kotlin/all-platforms/file_classes/test.py index 92689da3654..baf7556962d 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/file_classes/test.py +++ b/java/ql/integration-tests/kotlin/all-platforms/file_classes/test.py @@ -2,5 +2,5 @@ import commands def test(codeql, java_full, kotlinc_2_3_20): - commands.run(f"{kotlinc_2_3_20} -language-version 1.9 A.kt") - codeql.database.create(command=f"{kotlinc_2_3_20} -cp . -language-version 1.9 B.kt C.kt") + commands.run("kotlinc -language-version 1.9 A.kt") + codeql.database.create(command="kotlinc -cp . -language-version 1.9 B.kt C.kt") diff --git a/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.py b/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.py index c99a0990804..57b0b660561 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.py +++ b/java/ql/integration-tests/kotlin/all-platforms/java-interface-redeclares-tostring/test.py @@ -3,4 +3,4 @@ import commands def test(codeql, java_full, kotlinc_2_3_20): commands.run(["javac", "Test.java", "-d", "bin"]) - codeql.database.create(command=f"{kotlinc_2_3_20} -language-version 1.9 user.kt -cp bin") + codeql.database.create(command="kotlinc -language-version 1.9 user.kt -cp bin") diff --git a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.py b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.py index e622858b5b9..6346892aaa7 100644 --- a/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.py +++ b/java/ql/integration-tests/kotlin/all-platforms/kotlin_java_lowering_wildcards/test.py @@ -6,8 +6,8 @@ def test(codeql, java_full, kotlinc_2_3_20): commands.run(["javac", "JavaDefns2.java"]) codeql.database.create( command=[ - f"{kotlinc_2_3_20} kotlindefns.kt", + "kotlinc kotlindefns.kt", "javac JavaUser.java JavaDefns.java -cp .", - f"{kotlinc_2_3_20} -language-version 1.9 -cp . kotlinuser.kt", + "kotlinc -language-version 1.9 -cp . kotlinuser.kt", ] )