From 18560cde9d492da9e4cca5f04723c9931bcaafe8 Mon Sep 17 00:00:00 2001 From: Cornelius Riemenschneider Date: Sun, 8 Dec 2024 12:51:40 +0100 Subject: [PATCH 1/3] C#: Shorten test target names to make Windows happy. --- csharp/BUILD.bazel | 6 +++--- .../autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel | 3 ++- csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel | 3 ++- .../Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel | 2 +- .../Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel | 2 +- csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel index fbe4213ab9e1..4c8167660177 100644 --- a/csharp/BUILD.bazel +++ b/csharp/BUILD.bazel @@ -74,8 +74,8 @@ test_suite( name = "unit-tests", tags = ["csharp"], tests = [ - "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests", - "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests", - "//csharp/extractor/Semmle.Extraction.Tests", + "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests:t", + "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests:t", + "//csharp/extractor/Semmle.Extraction.Tests:t", ], ) diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel index 65371c893932..49a26bdb33bb 100644 --- a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel +++ b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel @@ -4,7 +4,8 @@ load( ) codeql_xunit_test( - name = "Semmle.Autobuild.CSharp.Tests", + # short name as we run into long path limitations on Windows + name = "t", srcs = glob([ "*.cs", ]), diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel index 10c8c6dc96c1..1cf2480403a7 100644 --- a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel +++ b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel @@ -4,7 +4,8 @@ load( ) codeql_xunit_test( - name = "Semmle.Autobuild.Cpp.Tests", + # short name as we run into long path limitations on Windows + name = "t", srcs = glob([ "*.cs", ]), diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel index 8be8aaa8408b..5a4d49c88fd5 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel @@ -10,7 +10,7 @@ codeql_csharp_library( "SourceGenerators/**/*.cs", ]), allow_unsafe_blocks = True, - internals_visible_to = ["Semmle.Extraction.Tests"], + internals_visible_to = ["t"], visibility = ["//csharp:__subpackages__"], deps = [ "//csharp/extractor/Semmle.Extraction.CSharp", diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel index 563168cdf480..e3d0533a776c 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel +++ b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel @@ -8,7 +8,7 @@ codeql_csharp_library( srcs = glob([ "*.cs", ]), - internals_visible_to = ["Semmle.Extraction.Tests"], + internals_visible_to = ["t"], visibility = ["//csharp:__subpackages__"], deps = [ "//csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching", diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel index df9799d3f959..4671fa33bb33 100644 --- a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel +++ b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel @@ -4,7 +4,8 @@ load( ) codeql_xunit_test( - name = "Semmle.Extraction.Tests", + # short name as we run into long path limitations on Windows + name = "t", srcs = glob([ "*.cs", ]), From 526dbe5901db34cadf27f01b70121e66cc96bce1 Mon Sep 17 00:00:00 2001 From: Cornelius Riemenschneider Date: Mon, 9 Dec 2024 12:19:01 +0100 Subject: [PATCH 2/3] Address review, also run semmle-util tests. --- csharp/BUILD.bazel | 7 ++++--- .../autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel | 2 +- csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel | 2 +- .../BUILD.bazel | 2 +- .../Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel | 2 +- csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel | 2 +- csharp/extractor/Semmle.Util.Tests/BUILD.bazel | 3 ++- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel index 4c8167660177..8aaa0d492ef0 100644 --- a/csharp/BUILD.bazel +++ b/csharp/BUILD.bazel @@ -74,8 +74,9 @@ test_suite( name = "unit-tests", tags = ["csharp"], tests = [ - "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests:t", - "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests:t", - "//csharp/extractor/Semmle.Extraction.Tests:t", + "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests:acst", + "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests:acpt", + "//csharp/extractor/Semmle.Extraction.Tests:et", + "//csharp/extractor/Semmle.Util.Tests:ut", ], ) diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel index 49a26bdb33bb..67f3470712dd 100644 --- a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel +++ b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel @@ -5,7 +5,7 @@ load( codeql_xunit_test( # short name as we run into long path limitations on Windows - name = "t", + name = "acst", srcs = glob([ "*.cs", ]), diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel index 1cf2480403a7..ad8f6e3d1f1a 100644 --- a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel +++ b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel @@ -5,7 +5,7 @@ load( codeql_xunit_test( # short name as we run into long path limitations on Windows - name = "t", + name = "acpt", srcs = glob([ "*.cs", ]), diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel index 5a4d49c88fd5..96ecccc31aa0 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel @@ -10,7 +10,7 @@ codeql_csharp_library( "SourceGenerators/**/*.cs", ]), allow_unsafe_blocks = True, - internals_visible_to = ["t"], + internals_visible_to = ["et"], visibility = ["//csharp:__subpackages__"], deps = [ "//csharp/extractor/Semmle.Extraction.CSharp", diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel index e3d0533a776c..a2c5a0c1c540 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel +++ b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel @@ -8,7 +8,7 @@ codeql_csharp_library( srcs = glob([ "*.cs", ]), - internals_visible_to = ["t"], + internals_visible_to = ["et"], visibility = ["//csharp:__subpackages__"], deps = [ "//csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching", diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel index 4671fa33bb33..4d13f7f4fb82 100644 --- a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel +++ b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel @@ -5,7 +5,7 @@ load( codeql_xunit_test( # short name as we run into long path limitations on Windows - name = "t", + name = "et", srcs = glob([ "*.cs", ]), diff --git a/csharp/extractor/Semmle.Util.Tests/BUILD.bazel b/csharp/extractor/Semmle.Util.Tests/BUILD.bazel index 6c3fb64e662c..5fde4efdb153 100644 --- a/csharp/extractor/Semmle.Util.Tests/BUILD.bazel +++ b/csharp/extractor/Semmle.Util.Tests/BUILD.bazel @@ -4,7 +4,8 @@ load( ) codeql_xunit_test( - name = "Semmle.Util.Tests", + # short name as we run into long path limitations on Windows + name = "ut", srcs = glob([ "*.cs", ]), From 798b86f6afc7905277e5dbaff4e8edaa15150e85 Mon Sep 17 00:00:00 2001 From: Cornelius Riemenschneider Date: Mon, 9 Dec 2024 12:26:15 +0100 Subject: [PATCH 3/3] Disable semmle.util.tests again. --- csharp/BUILD.bazel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel index 8aaa0d492ef0..49293c27095e 100644 --- a/csharp/BUILD.bazel +++ b/csharp/BUILD.bazel @@ -77,6 +77,7 @@ test_suite( "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests:acst", "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests:acpt", "//csharp/extractor/Semmle.Extraction.Tests:et", - "//csharp/extractor/Semmle.Util.Tests:ut", + # this test suite currently fails, disable for now + # "//csharp/extractor/Semmle.Util.Tests:ut", ], )