mirror of
https://github.com/systemd/systemd.git
synced 2025-03-22 06:50:18 +03:00
test: Drop sandbox() from integration test wrapper (#36009)
With the latest changes, this is not required anymore as mkosi sandbox will set up the proper $PATH to make sure the executables from the build directory are used.
This commit is contained in:
commit
d00739f3f4
2
.github/workflows/coverage.yml
vendored
2
.github/workflows/coverage.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: systemd/mkosi@7051715d8541d4d077a218f7445976225ec74d78
|
||||
- uses: systemd/mkosi@c1ae257e270e768088eadf7b44fbbbb48c575709
|
||||
|
||||
# Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
|
||||
# immediately, we remove the files in the background. However, we first move them to a different location
|
||||
|
2
.github/workflows/mkosi.yml
vendored
2
.github/workflows/mkosi.yml
vendored
@ -120,7 +120,7 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: systemd/mkosi@7051715d8541d4d077a218f7445976225ec74d78
|
||||
- uses: systemd/mkosi@c1ae257e270e768088eadf7b44fbbbb48c575709
|
||||
|
||||
# Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
|
||||
# immediately, we remove the files in the background. However, we first move them to a different location
|
||||
|
@ -37,15 +37,6 @@ ExecStart=false
|
||||
"""
|
||||
|
||||
|
||||
def sandbox(args: argparse.Namespace) -> list[str]:
|
||||
return [
|
||||
args.mkosi,
|
||||
'--directory', os.fspath(args.meson_source_dir),
|
||||
'--extra-search-path', os.fspath(args.meson_build_dir),
|
||||
'sandbox',
|
||||
] # fmt: skip
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Summary:
|
||||
distribution: str
|
||||
@ -87,7 +78,7 @@ def process_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
|
||||
exclude_regex = None
|
||||
|
||||
result = subprocess.run(
|
||||
sandbox(args) + [
|
||||
[
|
||||
'coredumpctl',
|
||||
'--file', journal_file,
|
||||
'--json=short',
|
||||
@ -110,7 +101,7 @@ def process_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
|
||||
return False
|
||||
|
||||
subprocess.run(
|
||||
sandbox(args) + [
|
||||
[
|
||||
'coredumpctl',
|
||||
'--file', journal_file,
|
||||
'--no-pager',
|
||||
@ -152,7 +143,7 @@ def process_sanitizer_report(args: argparse.Namespace, journal_file: Path) -> bo
|
||||
find_comm = re.compile(r'^\[[.0-9 ]+?\]\s(.*?:)\s')
|
||||
|
||||
with subprocess.Popen(
|
||||
sandbox(args) + [
|
||||
[
|
||||
'journalctl',
|
||||
'--output', 'short-monotonic',
|
||||
'--no-hostname',
|
||||
@ -246,7 +237,7 @@ def process_sanitizer_report(args: argparse.Namespace, journal_file: Path) -> bo
|
||||
|
||||
def process_coverage(args: argparse.Namespace, summary: Summary, name: str, journal_file: Path) -> None:
|
||||
coverage = subprocess.run(
|
||||
sandbox(args) + [
|
||||
[
|
||||
'journalctl',
|
||||
'--file', journal_file,
|
||||
'--field=COVERAGE_TAR',
|
||||
@ -266,7 +257,7 @@ def process_coverage(args: argparse.Namespace, summary: Summary, name: str, jour
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix='coverage-') as tmp:
|
||||
subprocess.run(
|
||||
sandbox(args) + [
|
||||
[
|
||||
'tar',
|
||||
'--extract',
|
||||
'--file', '-',
|
||||
@ -288,7 +279,7 @@ def process_coverage(args: argparse.Namespace, summary: Summary, name: str, jour
|
||||
p.rename(dst)
|
||||
|
||||
subprocess.run(
|
||||
sandbox(args) + [
|
||||
[
|
||||
'find',
|
||||
tmp,
|
||||
'-name', '*.gcda',
|
||||
@ -300,8 +291,7 @@ def process_coverage(args: argparse.Namespace, summary: Summary, name: str, jour
|
||||
) # fmt: skip
|
||||
|
||||
subprocess.run(
|
||||
sandbox(args)
|
||||
+ [
|
||||
[
|
||||
'rsync',
|
||||
'--archive',
|
||||
'--prune-empty-dirs',
|
||||
@ -315,8 +305,7 @@ def process_coverage(args: argparse.Namespace, summary: Summary, name: str, jour
|
||||
)
|
||||
|
||||
subprocess.run(
|
||||
sandbox(args)
|
||||
+ [
|
||||
[
|
||||
'lcov',
|
||||
*(
|
||||
[
|
||||
@ -340,8 +329,7 @@ def process_coverage(args: argparse.Namespace, summary: Summary, name: str, jour
|
||||
) # fmt: skip
|
||||
|
||||
subprocess.run(
|
||||
sandbox(args)
|
||||
+ [
|
||||
[
|
||||
'lcov',
|
||||
'--ignore-errors', 'inconsistent,inconsistent,format,corrupt,empty',
|
||||
'--add-tracefile', output if output.exists() else initial,
|
||||
|
Loading…
x
Reference in New Issue
Block a user