=== Applying patches on top of PostgreSQL commit ID e18b0cb7344cb4bd28468f6c0aeeb9b9241d30aa === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jun 10 18:48:24 UTC 2026 On branch cf/6045 nothing to commit, working tree clean === using 'git am' to apply patch ./v13-0001-Add-support-for-pytest-test-suites.patch === Applying: Add support for pytest test suites Using index info to reconstruct a base tree... A .cirrus.tasks.yml M configure M configure.ac M meson.build M src/Makefile.global.in M src/makefiles/meson.build Falling back to patching base and 3-way merge... Auto-merging src/makefiles/meson.build Auto-merging src/Makefile.global.in Auto-merging meson.build Auto-merging configure.ac Auto-merging configure CONFLICT (modify/delete): .cirrus.tasks.yml deleted in HEAD and modified in Add support for pytest test suites. Version Add support for pytest test suites of .cirrus.tasks.yml left in tree. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add support for pytest test suites When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v13-0001-Add-support-for-pytest-test-suites.patch === can't find file to patch at input line 45 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 29e4fc74a796a15b16ced223c9468e5918f79b57 Mon Sep 17 00:00:00 2001 |From: Jacob Champion |Date: Wed, 13 Aug 2025 10:58:56 -0700 |Subject: [PATCH v13 1/5] Add support for pytest test suites | |Specify --enable-pytest/-Dpytest=enabled at configure time. This |contains no Postgres test logic -- it is just a "vanilla" pytest |skeleton. | |This contains a custom pytest plugin to generate TAP output. This plugin |is used by the Meson mtest runner, to show relevant information for |failed tests. The pytest-tap plugin would have been preferable, but it's |now in maintenance mode, and it has problems with accidentally |suppressing important collection failures. | |Co-authored-by: Jelte Fennema-Nio |--- | .cirrus.tasks.yml | 11 +- | .gitignore | 3 + | configure | 166 +++++++++++++++++++++++++++++- | configure.ac | 24 ++++- | meson.build | 100 ++++++++++++++++++ | meson_options.txt | 8 +- | pyproject.toml | 21 ++++ | src/Makefile.global.in | 29 ++++++ | src/makefiles/meson.build | 2 + | src/test/Makefile | 1 + | src/test/meson.build | 1 + | src/test/pytest/Makefile | 20 ++++ | src/test/pytest/README | 1 + | src/test/pytest/meson.build | 15 +++ | src/test/pytest/pgtap.py | 197 ++++++++++++++++++++++++++++++++++++ | src/tools/testwrap | 6 +- | 16 files changed, 597 insertions(+), 8 deletions(-) | create mode 100644 pyproject.toml | create mode 100644 src/test/pytest/Makefile | create mode 100644 src/test/pytest/README | create mode 100644 src/test/pytest/meson.build | create mode 100644 src/test/pytest/pgtap.py | |diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml |index 4841a204248..47ec9def20e 100644 |--- a/.cirrus.tasks.yml |+++ b/.cirrus.tasks.yml -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored patching file .gitignore patching file configure Hunk #7 succeeded at 19556 (offset 131 lines). patching file configure.ac Hunk #2 succeeded at 2507 (offset 41 lines). patching file meson.build Hunk #1 succeeded at 1827 (offset 3 lines). Hunk #2 succeeded at 4159 (offset 119 lines). Hunk #3 succeeded at 4409 (offset 138 lines). patching file meson_options.txt patching file pyproject.toml patching file src/Makefile.global.in patching file src/makefiles/meson.build patching file src/test/Makefile patching file src/test/meson.build patching file src/test/pytest/Makefile patching file src/test/pytest/README patching file src/test/pytest/meson.build patching file src/test/pytest/pgtap.py patching file src/tools/testwrap Unstaged changes after reset: M .gitignore M configure M configure.ac M meson.build M meson_options.txt M src/Makefile.global.in M src/makefiles/meson.build M src/test/Makefile M src/test/meson.build M src/tools/testwrap Removing pyproject.toml Removing src/test/pytest/ === using 'git apply' to apply patch ./v13-0001-Add-support-for-pytest-test-suites.patch === error: .cirrus.tasks.yml: does not exist in index Applied patch to '.gitignore' cleanly. Applied patch to 'configure' cleanly. Applied patch to 'configure.ac' cleanly. Applied patch to 'meson.build' cleanly. Applied patch to 'meson_options.txt' cleanly. Falling back to direct application... Applied patch to 'src/Makefile.global.in' cleanly. Applied patch to 'src/makefiles/meson.build' cleanly. Applied patch to 'src/test/Makefile' cleanly. Applied patch to 'src/test/meson.build' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/tools/testwrap' cleanly.