hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20641 from github/redsun82/fix-pytest-build-as-test-windows

Browse Source 
Pytest: fix the `build-as-test` mode on Windows
This commit is contained in:
Paolo Tranquilli
2025-10-27 15:47:24 +01:00
committed by GitHub
parent 11a7d53002 6d31c6abe0
commit 630ea7bd0a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
misc/bazel/pkg.bzl
View File

@@ -3,12 +3,11 @@ Wrappers and helpers around `rules_pkg` to build codeql packs.
""" """
load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//lib:paths.bzl", "paths")
load("@bazel_skylib//rules:native_binary.bzl", "native_test")
load("@rules_pkg//pkg:install.bzl", "pkg_install") load("@rules_pkg//pkg:install.bzl", "pkg_install")
load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", _strip_prefix = "strip_prefix") load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", _strip_prefix = "strip_prefix")
load("@rules_pkg//pkg:pkg.bzl", "pkg_zip") load("@rules_pkg//pkg:pkg.bzl", "pkg_zip")
load("@rules_pkg//pkg:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo") load("@rules_pkg//pkg:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
load("@rules_python//python:defs.bzl", "py_binary") load("@rules_python//python:defs.bzl", "py_binary", "py_test")
load("//misc/bazel:os.bzl", "OS_DETECTION_ATTRS", "os_select") load("//misc/bazel:os.bzl", "OS_DETECTION_ATTRS", "os_select")
def _make_internal(name): def _make_internal(name):
@@ -366,28 +365,29 @@ def _codeql_pack_install(name, srcs, install_dest = None, build_file_label = Non
] if build_file_label else []) + ( ] if build_file_label else []) + (
["--destdir", "\"%s\"" % install_dest] if install_dest else [] ["--destdir", "\"%s\"" % install_dest] if install_dest else []
) )
py_binary( installer_args = dict(
name = name,
srcs = [Label("//misc/bazel/internal:install.py")], srcs = [Label("//misc/bazel/internal:install.py")],
main = Label("//misc/bazel/internal:install.py"), main = Label("//misc/bazel/internal:install.py"),
deps = ["@rules_python//python/runfiles"], deps = ["@rules_python//python/runfiles"],
data = data, data = data,
args = args, args = args,
) )
py_binary(
name = name,
**installer_args
)
# this hack is meant to be an optimization when using install for tests, where # this hack is meant to be an optimization when using install for tests, where
# the install step is skipped if nothing changed. If the installation directory # the install step is skipped if nothing changed. If the installation directory
# is somehow messed up, `bazel run` can be used to force install # is somehow messed up, `bazel run` can be used to force install
native_test( py_test(
name = internal("as", "test"), name = internal("as", "test"),
src = name,
tags = [ tags = [
"manual", # avoid having this picked up by `...`, `:all` or `:*` "manual", # avoid having this picked up by `...`, `:all` or `:*`
"local", # make sure installation does not run sandboxed "local", # make sure installation does not run sandboxed
], ],
data = data,
args = args,
size = "small", size = "small",
**installer_args
) )
def codeql_pack_group(name, srcs, visibility = None, skip_installer = False, prefix = "", install_dest = None, build_file_label = None, compression_level = 6): def codeql_pack_group(name, srcs, visibility = None, skip_installer = False, prefix = "", install_dest = None, build_file_label = None, compression_level = 6):