summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sweet <michael.r.sweet@gmail.com>2016-08-09 18:11:23 +0200
committerDidier Raboud <odyx@debian.org>2018-11-16 20:10:36 +0100
commit02b21d58bef0c7cfa8104b0d6443a16c753b635f (patch)
treef7ab6cd4c78c4fae6d5ae560e8bd83b01417483c
parentf584af3e5a1cd1e33dedbd09f329404ac2dd9330 (diff)
Revert pdftourf filter addition in tests
"Update "make test" to include alternate filter." . This fixes the error lines counting in the test, and is unneeded as pdftourf is not shipped in Debian. Origin: upstream Patch-Name: tests-no-pdftourf.patch
-rwxr-xr-xtest/run-stp-tests.sh4
-rw-r--r--test/test.convs1
-rw-r--r--test/test.types2
3 files changed, 1 insertions, 6 deletions
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 36d8d2435..1176ded56 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -271,7 +271,7 @@ case "$usedebugprintfs" in
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|mime).*$'; export CUPS_DEBUG_FILTER
+ CUPS_DEBUG_FILTER='^(http|_http|ipp|_ipp|cups.*Request|cupsGetResponse|cupsSend).*$'; export CUPS_DEBUG_FILTER
;;
*)
@@ -446,14 +446,12 @@ EOF
}
ln -s $root/test/test.convs $BASE/share/mime
-ln -s $root/test/test.types $BASE/share/mime
if test `uname` = Darwin; then
instfilter cgimagetopdf imagetopdf pdf
instfilter cgpdftopdf pdftopdf passthru
instfilter cgpdftops pdftops ps
instfilter cgpdftoraster pdftoraster raster
- instfilter cgpdftoraster pdftourf raster
instfilter cgtexttopdf texttopdf pdf
instfilter pstocupsraster pstoraster raster
else
diff --git a/test/test.convs b/test/test.convs
index 77a9ce01e..57540aac4 100644
--- a/test/test.convs
+++ b/test/test.convs
@@ -2,7 +2,6 @@
application/pdf application/vnd.cups-pdf 100 pdftopdf
application/pdf application/postscript 100 pdftops
application/pdf application/vnd.cups-raster 100 pdftoraster
-application/pdf image/urf 100 pdftourf
application/postscript application/vnd.cups-raster 100 pstoraster
image/jpeg application/pdf 100 imagetopdf
text/plain application/pdf 100 texttopdf
diff --git a/test/test.types b/test/test.types
deleted file mode 100644
index 914081c7f..000000000
--- a/test/test.types
+++ /dev/null
@@ -1,2 +0,0 @@
-# Test file listing potential MIME media types that are not in the standard mime.types file
-image/urf \ No newline at end of file