test for: examples/E50-initscripts-2.86.ds1-7.workaround.sh: add a workaround for #344089, and #262627

1 files changed, 21 insertions, 25 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 565e8f7..5968e5c 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Mon Dec 19 12:02:16 JST 2005
-pbuilder-time-stamp: 1134961336
+Current time: Wed Dec 21 19:50:26 JST 2005
+pbuilder-time-stamp: 1135162226
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/25900/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/13130/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -34,8 +34,8 @@ The following NEW packages will be installed:
   debconf-utils debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2915kB of archives.
-After unpacking 9609kB of additional disk space will be used.
+Need to get 0B/2917kB of archives.
+After unpacking 9617kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
 (Reading database ... 11897 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -50,7 +50,7 @@ Unpacking gettext (from .../gettext_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.34.1+20050828_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_0.9.1_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_0.9.2_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.10_all.deb) ...
 Selecting previously deselected package libdshconfig1.
@@ -67,7 +67,7 @@ Setting up html2text (1.3.2a-3) ...
 Setting up gettext (0.14.5-2) ...
 
 Setting up intltool-debian (0.34.1+20050828) ...
-Setting up po-debconf (0.9.1) ...
+Setting up po-debconf (0.9.2) ...
 Setting up debhelper (5.0.10) ...
 Setting up libdshconfig1 (0.20.11-1) ...
 
@@ -78,23 +78,20 @@ 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 97.9kB of archives.
+Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.6 [97.9kB]
-Fetched 97.9kB in 0s (413kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12493 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.6_amd64.deb) ...
 Setting up fakeroot (1.5.6) ...
 
 Copying back the cached apt archive contents
- -> new cache content fakeroot_1.5.6_amd64.deb added
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/25900/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/25900/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/13130/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/13130/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -376,7 +373,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -411,11 +407,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Mon Dec 19 03:02:52 UTC 2005
+Wed Dec 21 10:51:25 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -485,13 +481,13 @@ 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
-Mon Dec 19 03:02:57 UTC 2005
+Wed Dec 21 10:51:30 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -614,7 +610,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Mon Dec 19 12:02:59 JST 2005
-pbuilder-time-stamp: 1134961379
+Current time: Wed Dec 21 19:51:32 JST 2005
+pbuilder-time-stamp: 1135162292
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.PKaADs/dir1/25900 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.KGtFtK/dir1/13130 and its subdirectories