Fix 2.2.0 test packaging and CUPS datadir detection (#200, #201) - #204
Merged
Merged
Conversation
…OpenPrinting#201) - configure.ac: get CUPS_DATADIR from the .pc cups_datadir variable, not $prefix/share/cups (wrong under an arch-specific CUPS prefix); fallback kept. - test-pdftoraster-copy-height: proper check_PROGRAMS entry so its .c ships in make dist (was compiled by a wrapper into /tmp, omitted from the tarball). - test-pclm-overflow.sh: skip (exit 77) when AddressSanitizer is unavailable.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #200
Fixes #201
#201 — CUPS datadir under an architecture-specific prefix.
configure.acnow readsCUPS_DATADIRfrom thecups_datadirvariable incups.pc/cups3.pcinstead of reconstructing$prefix/share/cups, which pointed at/usr/<triplet>/share/cupswhen CUPS is built with an arch-specific prefix. Falls back to the old reconstruction for a.pcthat predates the variable.#200 — release tarball missing test-pdftoraster-copy-height.c. The test was compiled by a wrapper script into
/tmp, and its.cwas never named inMakefile.am, somake distomitted it. It is now a propercheck_PROGRAMSentry (nolibcupsfilterslink — it re-checks the copy_height loop logic standalone), so the source ships in the tarball and builds in-tree.#200 — ASan test fails without libasan.
test-pclm-overflow.shnow skips (Automake exit 77) when AddressSanitizer cannot be linked, so a missing libasan is a skip, not a failure; it still runs (and can fail) when ASan is installed.