update testsuite, which fixed the pdebuild problem.

1 files changed, 38 insertions, 39 deletions

diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index b5b8722..fe0ad26 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -1,4 +1,3 @@
-/usr/bin/pdebuild: line 39: [: dpkg-checkbuilddeps: unary operator expected
 dpkg-buildpackage: source package is dsh
 dpkg-buildpackage: source version is 0.25.4-1
 dpkg-buildpackage: source maintainer is Junichi Uekawa <dancer@debian.org>
@@ -30,8 +29,8 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Sat Dec 11 10:03:15 JST 2004
-pbuilder-time-stamp: 1102726995
+Current time: Wed Dec 29 20:28:21 JST 2004
+pbuilder-time-stamp: 1104319701
 Building the build Environment
  -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/testimage]
  -> creating local configuration
@@ -64,28 +63,28 @@ The following NEW packages will be installed:
   liblocale-gettext-perl libmagic1 libtext-charwidth-perl libtext-iconv-perl
   libtext-wrapi18n-perl po-debconf
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
-Need to get 2729kB of archives.
-After unpacking 11.2MB of additional disk space will be used.
+Need to get 2749kB of archives.
+After unpacking 11.3MB of additional disk space will be used.
 Get:1 http://ring.asahi-net.or.jp sarge/main liblocale-gettext-perl 1.01-17 [16.8kB]
 Get:2 http://ring.asahi-net.or.jp sarge/main libtext-iconv-perl 1.2-3 [12.2kB]
 Get:3 http://ring.asahi-net.or.jp sarge/main libtext-charwidth-perl 0.04-1 [11.0kB]
 Get:4 http://ring.asahi-net.or.jp sarge/main libtext-wrapi18n-perl 0.06-1 [8442B]
-Get:5 http://ring.asahi-net.or.jp sarge/main debconf-i18n 1.4.30.10 [88.4kB]
-Get:6 http://ring.asahi-net.or.jp sarge/main debconf 1.4.30.10 [101kB]
-Get:7 http://ring.asahi-net.or.jp sarge/main libmagic1 4.09-1 [217kB]
-Get:8 http://ring.asahi-net.or.jp sarge/main file 4.09-1 [25.9kB]
+Get:5 http://ring.asahi-net.or.jp sarge/main debconf-i18n 1.4.30.11 [90.1kB]
+Get:6 http://ring.asahi-net.or.jp sarge/main debconf 1.4.30.11 [101kB]
+Get:7 http://ring.asahi-net.or.jp sarge/main libmagic1 4.12-1 [233kB]
+Get:8 http://ring.asahi-net.or.jp sarge/main file 4.12-1 [28.6kB]
 Get:9 http://ring.asahi-net.or.jp sarge/main gettext-base 0.14.1-6 [91.1kB]
-Get:10 http://ring.asahi-net.or.jp sarge/main debconf-utils 1.4.30.10 [33.0kB]
+Get:10 http://ring.asahi-net.or.jp sarge/main debconf-utils 1.4.30.11 [33.0kB]
 Get:11 http://ring.asahi-net.or.jp sarge/main html2text 1.3.2a-1 [89.3kB]
 Get:12 http://ring.asahi-net.or.jp sarge/main gettext 0.14.1-6 [1555kB]
 Get:13 http://ring.asahi-net.or.jp sarge/main intltool-debian 0.30+20040213 [23.5kB]
 Get:14 http://ring.asahi-net.or.jp sarge/main po-debconf 0.8.15 [72.9kB]
-Get:15 http://ring.asahi-net.or.jp sarge/main debhelper 4.2.24 [360kB]
+Get:15 http://ring.asahi-net.or.jp sarge/main debhelper 4.2.28 [361kB]
 Get:16 http://ring.asahi-net.or.jp sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:17 http://ring.asahi-net.or.jp sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2729kB in 3s (684kB/s)
+Fetched 2749kB in 0s (3035kB/s)
 Selecting previously deselected package liblocale-gettext-perl.
-(Reading database ... 7698 files and directories currently installed.)
+(Reading database ... 7695 files and directories currently installed.)
 Unpacking liblocale-gettext-perl (from .../liblocale-gettext-perl_1.01-17_i386.deb) ...
 Selecting previously deselected package libtext-iconv-perl.
 Unpacking libtext-iconv-perl (from .../libtext-iconv-perl_1.2-3_i386.deb) ...
@@ -94,17 +93,17 @@ Unpacking libtext-charwidth-perl (from .../libtext-charwidth-perl_0.04-1_i386.de
 Selecting previously deselected package libtext-wrapi18n-perl.
 Unpacking libtext-wrapi18n-perl (from .../libtext-wrapi18n-perl_0.06-1_all.deb) ...
 Selecting previously deselected package debconf-i18n.
-Unpacking debconf-i18n (from .../debconf-i18n_1.4.30.10_all.deb) ...
+Unpacking debconf-i18n (from .../debconf-i18n_1.4.30.11_all.deb) ...
 Selecting previously deselected package debconf.
-Unpacking debconf (from .../debconf_1.4.30.10_all.deb) ...
+Unpacking debconf (from .../debconf_1.4.30.11_all.deb) ...
 Selecting previously deselected package libmagic1.
-Unpacking libmagic1 (from .../libmagic1_4.09-1_i386.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.09-1_i386.deb) ...
+Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.14.1-6_i386.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.30.10_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.30.11_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-1_i386.deb) ...
 Selecting previously deselected package gettext.
@@ -114,7 +113,7 @@ Unpacking intltool-debian (from .../intltool-debian_0.30+20040213_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_0.8.15_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_4.2.24_all.deb) ...
+Unpacking debhelper (from .../debhelper_4.2.28_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_i386.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -123,9 +122,9 @@ Setting up liblocale-gettext-perl (1.01-17) ...
 Setting up libtext-iconv-perl (1.2-3) ...
 Setting up libtext-charwidth-perl (0.04-1) ...
 Setting up libtext-wrapi18n-perl (0.06-1) ...
-Setting up libmagic1 (4.09-1) ...
+Setting up libmagic1 (4.12-1) ...
 
-Setting up file (4.09-1) ...
+Setting up file (4.12-1) ...
 Setting up gettext-base (0.14.1-6) ...
 
 Setting up html2text (1.3.2a-1) ...
@@ -137,27 +136,27 @@ Setting up po-debconf (0.8.15) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
 Setting up libdshconfig1-dev (0.20.11-1) ...
-Setting up debconf-i18n (1.4.30.10) ...
-Setting up debconf (1.4.30.10) ...
+Setting up debconf-i18n (1.4.30.11) ...
+Setting up debconf (1.4.30.11) ...
 
-Setting up debconf-utils (1.4.30.10) ...
+Setting up debconf-utils (1.4.30.11) ...
 
-Setting up debhelper (4.2.24) ...
+Setting up debhelper (4.2.28) ...
  -> Finished parsing the build-deps
 Reading Package Lists...
 Building Dependency Tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 66.4kB of archives.
-After unpacking 254kB of additional disk space will be used.
-Get:1 http://ring.asahi-net.or.jp sarge/main fakeroot 1.0.7 [66.4kB]
+Need to get 69.5kB of archives.
+After unpacking 262kB of additional disk space will be used.
+Get:1 http://ring.asahi-net.or.jp sarge/main fakeroot 1.2.1 [69.5kB]
 debconf: delaying package configuration, since apt-utils is not installed
-Fetched 66.4kB in 0s (1438kB/s)
+Fetched 69.5kB in 0s (1444kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 8526 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.0.7_i386.deb) ...
-Setting up fakeroot (1.0.7) ...
+(Reading database ... 8525 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.2.1_i386.deb) ...
+Setting up fakeroot (1.2.1) ...
 Copying source file
     -> copying [../dsh_0.25.4-1.dsc]
     -> copying [../dsh_0.25.4.orig.tar.gz]
@@ -478,7 +477,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sat Dec 11 01:03:47 UTC 2004
+Wed Dec 29 11:28:51 UTC 2004
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -548,14 +547,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Dec 11 01:03:54 UTC 2004
+Wed Dec 29 11:28:57 UTC 2004
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 c: c
 dsh: Process terminated (before write).
-b: b
 a: a
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -659,9 +658,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 83:  3378 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 83: 12815 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Sat Dec 11 10:03:58 JST 2004
-pbuilder-time-stamp: 1102727038
+Current time: Wed Dec 29 20:28:59 JST 2004
+pbuilder-time-stamp: 1104319739
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/testbuild2/3039 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/testbuild2/12484 and its subdirectories