From cb07ccdb7ab22f0633942e01c70f17d0fd5efcd8 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 8 Sep 2026 22:08:20 +0200 Subject: [PATCH] test/integration/projects/create-pkg-config: Add create-pkg-config's output is not covered by any test, even though the template and the Requires cleanup produce exact text that pkg-config consumes, so regressions in the generated file went unnoticed for a long time. Add an integration test that runs create-pkg-config with a full option set, with space- and comma-mixed Requires input, and with a Requires.private-only input, and compares the output against a reference file. Assisted-by: unsloth/Qwen3.8-27B-GGUF:Q4_K_M with pi.dev v0.84.2 Signed-off-by: Jan Lindemann --- .../projects/create-pkg-config/Makefile | 19 ++++++++++++ .../create-pkg-config/test-expected.txt | 31 +++++++++++++++++++ .../jw-pkg/projects/create-pkg-config/test.sh | 28 +++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 test/integration/jw-pkg/projects/create-pkg-config/Makefile create mode 100644 test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt create mode 100644 test/integration/jw-pkg/projects/create-pkg-config/test.sh diff --git a/test/integration/jw-pkg/projects/create-pkg-config/Makefile b/test/integration/jw-pkg/projects/create-pkg-config/Makefile new file mode 100644 index 00000000..4289f7ea --- /dev/null +++ b/test/integration/jw-pkg/projects/create-pkg-config/Makefile @@ -0,0 +1,19 @@ +TOPDIR = ../../../../.. + +OUTPUT = test-out.txt +REFERENCE = test-expected.txt + +include $(TOPDIR)/make/proj.mk +include $(TOPDIR)/make/test-jw-pkg.mk + +all: + +$(OUTPUT): Makefile test.sh + bash ./test.sh $(TEST_CMD_LINE) > $(OUTPUT).tmp + diff $(REFERENCE) $(OUTPUT).tmp + mv $(OUTPUT).tmp $(OUTPUT) + +test: $(OUTPUT) +clean: test.integration.in-tree.clean +test.integration.in-tree.clean: + rm -f $(OUTPUT) $(OUTPUT).tmp diff --git a/test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt b/test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt new file mode 100644 index 00000000..2a43ccfb --- /dev/null +++ b/test/integration/jw-pkg/projects/create-pkg-config/test-expected.txt @@ -0,0 +1,31 @@ +============= Running: jw-pkg.py -t ../../../../.. --log-level info projects create-pkg-config -n jw-pkg -s jw-pkg test -p /usr -v 1.0 --cflags=-I/usr/include --libflags=-L/usr/lib -ljw-pkg -r jw-core >= 1.0, jw-base -R jw-devel +prefix = /usr +exec_prefix = ${prefix} +includedir = ${prefix}/include +libdir = ${exec_prefix}/lib + +Name: jw-pkg +Description: jw-pkg test +Version: 1.0 +Cflags: -I/usr/include +Libs: -L/usr/lib -ljw-pkg +Requires: jw-core >= 1.0, jw-base +Requires.private: jw-devel============= Running: jw-pkg.py -t ../../../../.. --log-level info projects create-pkg-config -n jw-pkg -p /usr -v 1.0 -r foo bar>=2.0, baz +prefix = /usr +exec_prefix = ${prefix} +includedir = ${prefix}/include +libdir = ${exec_prefix}/lib + +Name: jw-pkg +Description: +Version: 1.0 +Requires: foo, bar >= 2.0, baz============= Running: jw-pkg.py -t ../../../../.. --log-level info projects create-pkg-config -n jw-pkg -p /usr -v 1.0 -R qux +prefix = /usr +exec_prefix = ${prefix} +includedir = ${prefix}/include +libdir = ${exec_prefix}/lib + +Name: jw-pkg +Description: +Version: 1.0 +Requires.private: qux \ No newline at end of file diff --git a/test/integration/jw-pkg/projects/create-pkg-config/test.sh b/test/integration/jw-pkg/projects/create-pkg-config/test.sh new file mode 100644 index 00000000..16812f54 --- /dev/null +++ b/test/integration/jw-pkg/projects/create-pkg-config/test.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# shellcheck disable=SC2048,SC2086 +# Unquoted $* is intentional — the jw-pkg command line + +export LC_ALL="C" +set -euo pipefail + +jw_pkg_py="$*" + +run() +{ + local log_cmd + # shellcheck disable=SC2001 + log_cmd=$(echo "$*" | sed 's|.*python3[0-9.]*\s\+\(\.\.\/\)*scripts/||') + printf '============= Running: %s\n' "$log_cmd" + "$@" +} + +run $jw_pkg_py projects create-pkg-config \ + -n jw-pkg -s 'jw-pkg test' -p /usr -v 1.0 \ + --cflags=-I/usr/include --libflags=-L/usr/lib\ -ljw-pkg \ + -r 'jw-core >= 1.0, jw-base' -R 'jw-devel' + +run $jw_pkg_py projects create-pkg-config \ + -n jw-pkg -p /usr -v 1.0 -r 'foo bar>=2.0, baz' + +run $jw_pkg_py projects create-pkg-config \ + -n jw-pkg -p /usr -v 1.0 -R 'qux'