Skip to content

Commit 2796d60

Browse files
igfooigfoo
authored
Merge pull request github#11019 from igfoo/igfoo/win_integ
Kotlin: Get some integration tests running on Windows
2 parents caf9ac5 + 49425e6 commit 2796d60

File tree

119 files changed

+23
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+23
-10
lines changed

‎java/ql/integration-tests/posix-only/kotlin/enabling/KotlinDefault.kt renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/KotlinDefault.kt

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enabling/KotlinDisabled.kt renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/KotlinDisabled.kt

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enabling/KotlinEnabled.kt renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/KotlinEnabled.kt

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enabling/build.py renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/build.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
from create_database_utils import *
44

5-
runSuccessfully(["kotlinc", "KotlinDefault.kt"])
5+
runSuccessfully([get_cmd("kotlinc"), "KotlinDefault.kt"])
66
os.environ['CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN'] = 'true'
7-
runSuccessfully(["kotlinc", "KotlinDisabled.kt"])
7+
runSuccessfully([get_cmd("kotlinc"), "KotlinDisabled.kt"])
88
del(os.environ['CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN'])
99
os.environ['CODEQL_EXTRACTOR_JAVA_AGENT_ENABLE_KOTLIN'] = 'true'
10-
runSuccessfully(["kotlinc", "KotlinEnabled.kt"])
10+
runSuccessfully([get_cmd("kotlinc"), "KotlinEnabled.kt"])

‎java/ql/integration-tests/posix-only/kotlin/enabling/class.expected renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/class.expected

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enabling/class.ql renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/class.ql

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enabling/test.py renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enabling/test.py

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/NotNull.java renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enhanced-nullability/NotNull.java

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/Test.java renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enhanced-nullability/Test.java

File renamed without changes.

‎java/ql/integration-tests/posix-only/kotlin/enhanced-nullability/test.expected renamed to ‎java/ql/integration-tests/all-platforms/kotlin/enhanced-nullability/test.expected

File renamed without changes.

0 commit comments

Comments
 (0)