From b1d9f9f9d53a0d17323310199196fd91116ffa75 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 31 Oct 2022 14:46:46 +0000 Subject: [PATCH 1/3] Kotlin: Run compiler_arguments test on all platforms --- .../kotlin/compiler_arguments/app/build.gradle | 0 .../compiler_arguments/app/src/main/kotlin/testProject/App.kt | 0 .../kotlin/compiler_arguments/compArgs.expected | 0 .../kotlin/compiler_arguments/compArgs.ql | 0 .../kotlin/compiler_arguments/settings.gradle | 0 .../kotlin/compiler_arguments/test.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename java/ql/integration-tests/{posix-only => all-platforms}/kotlin/compiler_arguments/app/build.gradle (100%) rename java/ql/integration-tests/{posix-only => all-platforms}/kotlin/compiler_arguments/app/src/main/kotlin/testProject/App.kt (100%) rename java/ql/integration-tests/{posix-only => all-platforms}/kotlin/compiler_arguments/compArgs.expected (100%) rename java/ql/integration-tests/{posix-only => all-platforms}/kotlin/compiler_arguments/compArgs.ql (100%) rename java/ql/integration-tests/{posix-only => all-platforms}/kotlin/compiler_arguments/settings.gradle (100%) rename java/ql/integration-tests/{posix-only => all-platforms}/kotlin/compiler_arguments/test.py (100%) diff --git a/java/ql/integration-tests/posix-only/kotlin/compiler_arguments/app/build.gradle b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/app/build.gradle similarity index 100% rename from java/ql/integration-tests/posix-only/kotlin/compiler_arguments/app/build.gradle rename to java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/app/build.gradle diff --git a/java/ql/integration-tests/posix-only/kotlin/compiler_arguments/app/src/main/kotlin/testProject/App.kt b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/app/src/main/kotlin/testProject/App.kt similarity index 100% rename from java/ql/integration-tests/posix-only/kotlin/compiler_arguments/app/src/main/kotlin/testProject/App.kt rename to java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/app/src/main/kotlin/testProject/App.kt diff --git a/java/ql/integration-tests/posix-only/kotlin/compiler_arguments/compArgs.expected b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.expected similarity index 100% rename from java/ql/integration-tests/posix-only/kotlin/compiler_arguments/compArgs.expected rename to java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.expected diff --git a/java/ql/integration-tests/posix-only/kotlin/compiler_arguments/compArgs.ql b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.ql similarity index 100% rename from java/ql/integration-tests/posix-only/kotlin/compiler_arguments/compArgs.ql rename to java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.ql diff --git a/java/ql/integration-tests/posix-only/kotlin/compiler_arguments/settings.gradle b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/settings.gradle similarity index 100% rename from java/ql/integration-tests/posix-only/kotlin/compiler_arguments/settings.gradle rename to java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/settings.gradle diff --git a/java/ql/integration-tests/posix-only/kotlin/compiler_arguments/test.py b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/test.py similarity index 100% rename from java/ql/integration-tests/posix-only/kotlin/compiler_arguments/test.py rename to java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/test.py From 27836680920ec6633bce94896c69d45867b7d836 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 31 Oct 2022 14:47:32 +0000 Subject: [PATCH 2/3] Kotlin: compiler_arguments test: Fix running gradle on Windows --- .../all-platforms/kotlin/compiler_arguments/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/test.py b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/test.py index e5e9aca69bc..c1ba4d3370b 100644 --- a/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/test.py +++ b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/test.py @@ -2,4 +2,4 @@ from create_database_utils import * run_codeql_database_create( ["gradle build --no-daemon --no-build-cache"], lang="java") -runSuccessfully(["gradle", "clean"]) +runSuccessfully([get_cmd("gradle"), "clean"]) From caa56c9cadb5e87c9453f990126f7758298b4054 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 31 Oct 2022 16:31:08 +0000 Subject: [PATCH 3/3] Kotlin: compiler_arguments test: Normalise path separators in output Otherwise we get different output on Windows vs Posix. --- .../all-platforms/kotlin/compiler_arguments/compArgs.ql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.ql b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.ql index fe4bedba634..5f843fb00dc 100644 --- a/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.ql +++ b/java/ql/integration-tests/all-platforms/kotlin/compiler_arguments/compArgs.ql @@ -12,4 +12,4 @@ private string getArgument(Compilation c, int i) { } from Compilation c, int i -select i, getArgument(c, i) +select i, getArgument(c, i).replaceAll("\\", "/")