Some test suite cleanup.

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index ac37f0d92e47525180798350918a096c916a8508..9a1bb748ffc7c9072171f16b1c267d4a51d599e0 100755 (executable)
--- 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...
 #