Skip to content

Commit c2aff1e

Browse files
committed
Port all-platforms/kotlin tests to pytest.
1 parent ed7f330 commit c2aff1e

File tree

73 files changed

+314
-1734
lines changed

Some content is hidden

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

73 files changed

+314
-1734
lines changed
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
from create_database_utils import *
1+
import os
22

3-
os.mkdir('out')
4-
os.mkdir('out2')
5-
run_codeql_database_create(["kotlinc test.kt -d out", "javac User.java -cp out -d out2", "kotlinc ktUser.kt -cp out -d out2"], lang="java")
3+
4+
def test(codeql, java_full):
5+
os.mkdir("out")
6+
codeql.database.create(
7+
command=["kotlinc test.kt -d out", "javac User.java -cp out", "kotlinc ktUser.kt -cp out"]
8+
)

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/.gitattributes

Lines changed: 0 additions & 6 deletions
This file was deleted.

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/force_sequential_test_execution

Lines changed: 0 additions & 3 deletions
This file was deleted.

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradlew

Lines changed: 0 additions & 244 deletions
This file was deleted.

java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/gradlew.bat

Lines changed: 0 additions & 92 deletions
This file was deleted.
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
import platform
2-
from create_database_utils import *
3-
4-
gradle_cmd = "gradlew.bat" if platform.system() == "Windows" else "./gradlew"
5-
6-
run_codeql_database_create(
7-
["%s build --no-daemon --no-build-cache" % gradle_cmd], lang="java")
1+
def test(codeql, java_full, gradle_7_6):
2+
codeql.database.create(command=f"{gradle_7_6} build")
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from create_database_utils import *
2-
import subprocess
1+
import commands
32

4-
subprocess.check_call([get_cmd("kotlinc"), "lib.kt", "-d", "lib"])
5-
run_codeql_database_create(["kotlinc user.kt -cp lib"], lang="java")
3+
4+
def test(codeql, java_full):
5+
commands.run("kotlinc lib.kt -d lib")
6+
codeql.database.create(command=["kotlinc user.kt -cp lib"])

0 commit comments

Comments
 (0)