From: Michael R Sweet Date: Tue, 9 Sep 2025 15:32:08 +0000 (-0400) Subject: Some test suite cleanup. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360229bc69f243995241df9e4b18db8eff152c02;p=thirdparty%2Fcups.git Some test suite cleanup. --- diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index ac37f0d92e..9a1bb748ff 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -256,14 +256,14 @@ case "$usedebugprintfs" in echo "Enabling debug printfs (level 5); log files can be found in $BASE/log..." CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG CUPS_DEBUG_LEVEL=5; export CUPS_DEBUG_LEVEL - CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER + CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cupsCreate|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER ;; 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9) echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..." CUPS_DEBUG_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL - CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER + CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cupsCreate|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER ;; *) @@ -365,21 +365,12 @@ ln -s $root/templates $BASE/share instfilter() { # instfilter src dst format # - # See if the filter exists in a standard location; if so, make a - # symlink, otherwise create a dummy script for the specified format. + # Create a dummy script for the specified format. # src="$1" dst="$2" format="$3" - for dir in /usr/local/libexec/cups/filter /usr/libexec/cups/filter /usr/lib/cups/filter; do - if test -x "$dir/$src"; then - ln -s "$dir/$src" "$BASE/bin/filter/$dst" - return - fi - done - - # Source filter not present, create a dummy filter case $format in passthru) ln -s gziptoany "$BASE/bin/filter/$dst" @@ -530,10 +521,6 @@ PassEnv ASAN_OPTIONS Sandboxing Off EOF -if test $ssltype != 0 -a `uname` = Darwin; then - echo "ServerKeychain $HOME/Library/Keychains/login.keychain" >> $BASE/cups-files.conf -fi - # # Setup lots of test queues with PPD files... #