openkylin
/
cups
mirror of https://gitee.com/openkylin/cups.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tests: Do not test pdftourf 

Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "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

Gbp-Pq: Name 0016-Tests-Do-not-test-pdftourf.patch
This commit is contained in:
Michael Sweet 2016-08-09 18:11:23 +02:00 committed by openKylinBot
parent 4c5ef314ba
commit b90f4adbbb
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/run-stp-tests.sh
View File

@ -268,7 +268,7 @@ case "$usedebugprintfs" in
echo "Enabling debug printfs (level $usedebugprintfs); log files can be found in $BASE/log..." 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_LOG="$BASE/log/debug_printfs.%d"; export CUPS_DEBUG_LOG
CUPS_DEBUG_LEVEL="$usedebugprintfs"; export CUPS_DEBUG_LEVEL 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
;; ;;
*) *)
@ -443,14 +443,12 @@ EOF
} }
ln -s $root/test/test.convs $BASE/share/mime ln -s $root/test/test.convs $BASE/share/mime
ln -s $root/test/test.types $BASE/share/mime
if test `uname` = Darwin; then if test `uname` = Darwin; then
instfilter cgimagetopdf imagetopdf pdf instfilter cgimagetopdf imagetopdf pdf
instfilter cgpdftopdf pdftopdf passthru instfilter cgpdftopdf pdftopdf passthru
instfilter cgpdftops pdftops ps instfilter cgpdftops pdftops ps
instfilter cgpdftoraster pdftoraster raster instfilter cgpdftoraster pdftoraster raster
instfilter cgpdftoraster pdftourf raster
instfilter cgtexttopdf texttopdf pdf instfilter cgtexttopdf texttopdf pdf
instfilter pstocupsraster pstoraster raster instfilter pstocupsraster pstoraster raster
else else

1
test/test.convs
View File

@ -2,7 +2,6 @@
application/pdf application/vnd.cups-pdf 100 pdftopdf application/pdf application/vnd.cups-pdf 100 pdftopdf
application/pdf application/postscript 100 pdftops application/pdf application/postscript 100 pdftops
application/pdf application/vnd.cups-raster 100 pdftoraster application/pdf application/vnd.cups-raster 100 pdftoraster
application/pdf image/urf 100 pdftourf
application/postscript application/vnd.cups-raster 100 pstoraster application/postscript application/vnd.cups-raster 100 pstoraster
image/jpeg application/pdf 100 imagetopdf image/jpeg application/pdf 100 imagetopdf
text/plain application/pdf 100 texttopdf text/plain application/pdf 100 texttopdf

2
test/test.types
View File

@ -1,2 +0,0 @@
# Test file listing potential MIME media types that are not in the standard mime.types file
image/urf