← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cups/oneiric-proposed

« back to all changes in this revision

Viewing changes to test/run-stp-tests.sh

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Till Kamppeter, Martin Pitt
  • Date: 2011-08-07 12:53:12 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20110807125312-s323cyb3oqaxaemo
Tags: 1.5.0-1
http://bugs.debian.org/635105
http://bugs.debian.org/635108
https://launchpad.net/bugs/677432
[ Till Kamppeter ]
* New upstream release
* debian/patches/usb-backend-no-segfault-on-bad-device-id.patch,
  debian/patches/usb-backend-accept-old-usblp-uris.patch,
  debian/patches/use-ps2write-ghostscript-device-for-pdftops-filter.patch:
  Removed, included upstream.
* debian/patches/poppler-based-pdftops-fixes.patch,
  debian/patches/do-not-emit-ps-level-3-with-poppler.patch: Replaced patch
  by a new one only containing the parts which remain after removing the
  parts included upstream.
* debian/patches/pidfile.patch,
  debian/patches/ppd-poll-with-client-conf.patch,
  debian/patches/cups-avahi.patch,
  debian/patches/drop_unnecessary_dependencies.patch,
  debian/patches/do-not-broadcast-with-hostnames.patch,
  debian/patches/ppdc-dynamic-linking.patch,
  debian/patches/pstops-based-workflow-only-for-printing-ps-on-a-ps-printer.patch:
  Manually regenerated to adapt to upstream changes.
* debian/patches/manpage-translations.patch,
  debian/patches/rootbackends-worldreadable.patch,
  debian/patches/no-conffile-timestamp.patch,
  debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch,
  debian/patches/cups-snmp-oids-device-id-hp-ricoh.patch,
  debian/patches/configure-default-browse-protocols.patch,
  debian/patches/logfiles_adm_readable.patch,
  debian/patches/confdirperms.patch,
  debian/patches/printer-filtering.patch,
  debian/patches/show-compile-command-lines.patch,
  debian/patches/log-debug-history-nearly-unlimited.patch:
  Refreshed using quilt.
* debian/patches/default-ripcache-size-auto.patch: Dropped, as once,
  Ghostscript 9.04 is ignoring the cache size value as it crashes easily
  otherwise (Ghostscript upstream bug #691586) and second, CUPS defaults to
  more reasonable 128 MB (now only used for imagetops).
* debian/patches/support-gzipped-charmaps.patch: Dropped, as the SBCS and
  VBCS character maps are not used any more by CUPS.
* debian/rules: Enable threads in the ./configure command line, as otherwise
  CUPS 1.5.0 does not build at all.
* debian/local/filters/pdf-filters/filter/pdftoijs.cxx,
  debian/local/filters/pdf-filters/filter/pdftoraster.cxx,
  debian/local/filters/pdf-filters/pdftoopvp/pdftoopvp.cxx,
  debian/local/filters/pdf-filters/pdftopdf/pdftopdf.cxx: Under CUPS 1.5.x.
  all programs using the PPD API of CUPS need to explicitly include
  "<cups/ppd.h>". Updated the PDF filter add-on package.
* debian/local/filters/pdf-filters/addtocups: Make the addition of the
  pdftopdf and pdftoopvp directories also work with CUPS 1.5.x.
* debian/local/filters/pdf-filters/addtocups,
  debian/local/filters/pdf-filters/removefromcups: Added a symbolic link
  cups/i18n.h, so that texttopdf builds.
* debian/cups-client.install: Install the new ipptool and its sample
  files and manpages.
* debian/cups-client.install: Commented out lines for dropped man page
  translations: ipptool, lppasswd, client.conf, ipptoolfile, cupsenable,
  lpadmin, lpinfo, cupsreject, cupsdisable, cupsaccept
* debian/cups-common.install, debian/rules: The /usr/share/cups/charmaps
  directory got removed from CUPS.
* debian/libcups2-dev.install: cups/i18n.h got renamed to
  cups/language-private.h. Install this as /usr/include/cups/i18n.h.
* debian/libcups2.symbols, debian/libcupsmime1.symbols: Updated.
* debian/cups.lintian-overrides, debian/cups.postinst, debian/cups.prerm,
  debian/cups.templates, debian/local/apparmor-profile: The "scsi"
  CUPS backend got dropped upstream, removed its treatment from these files.

[ Martin Pitt ]
* Add Serbian (Cyrillic) debconf translations, thanks Zlatan Todoric.
  (Closes: #635105)
* Add Serbian (Latin) debconf translations, thanks Zlatan Todoric.
  (Closes: #635108)
* debian/local/apparmor-profile: Allow access to serial printers on USB
  adapters. (LP: #677432)

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/run-stp-tests.sh
1
1
#!/bin/sh
2
2
#
3
 
# "$Id: run-stp-tests.sh 9445 2011-01-08 00:03:51Z mike $"
 
3
# "$Id: run-stp-tests.sh 9750 2011-05-06 22:53:53Z mike $"
4
4
#
5
5
#   Perform the complete set of IPP compliance tests specified in the
6
6
#   CUPS Software Test Plan.
251
251
ln -s $root/backend/lpd /tmp/cups-$user/bin/backend
252
252
ln -s $root/backend/mdns /tmp/cups-$user/bin/backend
253
253
ln -s $root/backend/parallel /tmp/cups-$user/bin/backend
 
254
ln -s $root/backend/pseudo /tmp/cups-$user/bin/backend
254
255
ln -s $root/backend/serial /tmp/cups-$user/bin/backend
255
256
ln -s $root/backend/snmp /tmp/cups-$user/bin/backend
256
257
ln -s $root/backend/socket /tmp/cups-$user/bin/backend
266
267
ln -s $root/filter/pstops /tmp/cups-$user/bin/filter
267
268
ln -s $root/filter/rastertoepson /tmp/cups-$user/bin/filter
268
269
ln -s $root/filter/rastertohp /tmp/cups-$user/bin/filter
 
270
ln -s $root/filter/rastertolabel /tmp/cups-$user/bin/filter
 
271
ln -s $root/filter/rastertopwg /tmp/cups-$user/bin/filter
269
272
ln -s $root/filter/texttops /tmp/cups-$user/bin/filter
270
273
 
271
274
ln -s $root/data/classified /tmp/cups-$user/share/banners
285
288
ln -s $root/data/*.defs /tmp/cups-$user/share/ppdc
286
289
ln -s $root/templates /tmp/cups-$user/share
287
290
 
 
291
if test -f $root/filter/imagetops; then
 
292
        ln -s $root/filter/imagetops /tmp/cups-$user/bin/filter
 
293
fi
 
294
 
 
295
if test -f $root/filter/imagetoraster; then
 
296
        ln -s $root/filter/imagetoraster /tmp/cups-$user/bin/filter
 
297
fi
 
298
 
288
299
#
289
300
# Mac OS X filters and configuration files...
290
301
#
300
311
        ln -s /usr/libexec/cups/filter/pstoappleps /tmp/cups-$user/bin/filter
301
312
        ln -s /usr/libexec/cups/filter/pstocupsraster /tmp/cups-$user/bin/filter
302
313
        ln -s /usr/libexec/cups/filter/pstopdffilter /tmp/cups-$user/bin/filter
 
314
        ln -s /usr/libexec/cups/filter/rastertourf /tmp/cups-$user/bin/filter
 
315
        ln -s /usr/libexec/cups/filter/xhtmltopdf /tmp/cups-$user/bin/filter
303
316
 
304
317
        if test -f /private/etc/cups/apple.types; then
305
318
                ln -s /private/etc/cups/apple.* /tmp/cups-$user/share/mime
307
320
                ln -s /usr/share/cups/mime/apple.* /tmp/cups-$user/share/mime
308
321
        fi
309
322
else
310
 
        ln -s $root/filter/imagetops /tmp/cups-$user/bin/filter
311
 
        ln -s $root/filter/imagetoraster /tmp/cups-$user/bin/filter
312
323
        ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
313
324
fi
314
325
 
543
554
#
544
555
 
545
556
date=`date "+%Y-%m-%d"`
546
 
strfile=/tmp/cups-$user/cups-str-1.4-$date-$user.html
 
557
strfile=/tmp/cups-$user/cups-str-1.5-$date-$user.html
547
558
 
548
559
rm -f $strfile
549
560
cat str-header.html >$strfile
566
577
        echo "Performing $file..."
567
578
        echo "" >>$strfile
568
579
 
569
 
        ./ipptest ipp://localhost:$port/printers $file | tee -a $strfile
 
580
        ./ipptool -t ipp://localhost:$port/printers $file | tee -a $strfile
570
581
        status=$?
571
582
 
572
583
        if test $status != 0; then
750
761
 
751
762
# Warning log messages
752
763
count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
753
 
if test $count != 0; then
754
 
        echo "FAIL: $count warning messages, expected 0."
 
764
if test $count != 9; then
 
765
        echo "FAIL: $count warning messages, expected 9."
755
766
        $GREP '^W ' /tmp/cups-$user/log/error_log
756
 
        echo "<P>FAIL: $count warning messages, expected 0.</P>" >>$strfile
 
767
        echo "<P>FAIL: $count warning messages, expected 9.</P>" >>$strfile
757
768
        echo "<PRE>" >>$strfile
758
769
        $GREP '^W ' /tmp/cups-$user/log/error_log | sed -e '1,$s/&/&amp;/g' -e '1,$s/</&lt;/g' >>$strfile
759
770
        echo "</PRE>" >>$strfile
811
822
        echo "<P>PASS: $count debug2 messages.</P>" >>$strfile
812
823
fi
813
824
 
814
 
# Page log file...
815
 
if $GREP -iq 'testfile.pdf na_letter_8.5x11in' /tmp/cups-$user/log/page_log; then
816
 
        echo "PASS: page_log formatted correctly."
817
 
        echo "<P>PASS: page_log formatted correctly.</P>" >>$strfile
818
 
else
819
 
        echo "WARN: page_log formatted incorrectly."
820
 
        echo "<P>WARN: page_log formatted incorrectly.</P>" >>$strfile
821
 
#       fail=`expr $fail + 1`
822
 
fi
823
 
 
824
825
# Log files...
825
826
echo "<H2>access_log</H2>" >>$strfile
826
827
echo "<PRE>" >>$strfile
866
867
fi
867
868
 
868
869
#
869
 
# End of "$Id: run-stp-tests.sh 9445 2011-01-08 00:03:51Z mike $"
 
870
# End of "$Id: run-stp-tests.sh 9750 2011-05-06 22:53:53Z mike $"
870
871
#