[Pbuilder-maint] pbuilder CVS update: pbuilder/testsuite
run-test.sh run-test-uml.sh run-regression.sh run-regression.log
pbuilder CVS Commit
pbuilder-maint at lists.alioth.debian.org
Wed Dec 21 11:47:08 UTC 2005
User: dancer
Date: 05/12/21 11:47:07
Modified: testsuite run-test.sh run-test-uml.sh run-regression.sh
run-regression.log
Log:
test for: examples/E50-initscripts-2.86.ds1-7.workaround.sh: add a workaround for #344089, and #262627
Revision Changes Path
1.30 +11 -6 pbuilder/testsuite/run-test.sh
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-test.sh?annotate=1.30&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-test.sh?rev=1.30&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-test.sh.diff?r1=1.30&r2=1.29&cvsroot=
-----------------------------------
Index: run-test.sh
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/testsuite/run-test.sh,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- run-test.sh 29 Nov 2005 13:59:09 -0000 1.29
+++ run-test.sh 21 Dec 2005 11:47:07 -0000 1.30
@@ -27,6 +27,8 @@
testbuild2=$testdir/dir2
testbuild3=$testdir/dir3
+HOOKOPTION=" --hookdir /usr/share/doc/pbuilder/examples/344089"
+
for DEBOOTSTRAP in debootstrap cdebootstrap; do
case $DEBOOTSTRAP in
debootstrap)
@@ -49,7 +51,7 @@
for distribution in sid sarge etch; do
sudo ${PBUILDER} create "${DEBOOTSTRAPOPTS[@]}" --mirror $mirror --debootstrap ${DEBOOTSTRAP} --distribution "${distribution}" --basetgz ${testimage} --logfile ${logdir}/pbuilder-create-${distribution}.log
-# --hookdir /usr/share/doc/pbuilder/examples/libc6workaround
+
log_success create-${distribution}-${DEBOOTSTRAP}
for PKG in dsh; do
@@ -79,22 +81,25 @@
# upgrading testing.
case $distribution in
sarge)
- sudo ${PBUILDER} update --basetgz ${testimage} --distribution etch --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch.log
+ sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution etch --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch.log
log_success update-${distribution}-etch.log
- sudo ${PBUILDER} update --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch-sid.log
+ sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch-sid.log
log_success update-${distribution}-etch-sid.log
- sudo ${PBUILDER} update --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch-sid-experimental.log
+ sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-etch-sid-experimental.log
log_success update-${distribution}-etch-sid-experimental.log
;;
etch)
- sudo ${PBUILDER} update --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid.log
+ sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution sid --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid.log
log_success update-${distribution}-sid.log
- sudo ${PBUILDER} update --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid-experimental.log
+ sudo ${PBUILDER} update $HOOKOPTION --basetgz ${testimage} --distribution experimental --mirror $mirror --override-config --logfile ${logdir}/pbuilder-update-${distribution}-sid-experimental.log
log_success update-${distribution}-sid-experimental.log
;;
esac
sudo rm -rf ${testbuild} ${testbuild2} ${testimage} ${testbuild3}
done
+
+ echo '### RESULT: ###'
+ cat "${RESULTFILE}"
done
rm -r ${testdir}
1.4 +2 -1 pbuilder/testsuite/run-test-uml.sh
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-test-uml.sh?annotate=1.4&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-test-uml.sh?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-test-uml.sh.diff?r1=1.4&r2=1.3&cvsroot=
-----------------------------------
Index: run-test-uml.sh
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/testsuite/run-test-uml.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- run-test-uml.sh 24 Jul 2004 02:05:41 -0000 1.3
+++ run-test-uml.sh 21 Dec 2005 11:47:07 -0000 1.4
@@ -58,4 +58,5 @@
kill ${TCPPROXY}
-
+echo '### RESULT: ###'
+cat "${RESULTFILE}"
1.3 +5 -1 pbuilder/testsuite/run-regression.sh
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-regression.sh?annotate=1.3&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-regression.sh?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-regression.sh.diff?r1=1.3&r2=1.2&cvsroot=
-----------------------------------
Index: run-regression.sh
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/testsuite/run-regression.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- run-regression.sh 13 Dec 2005 13:51:20 -0000 1.2
+++ run-regression.sh 21 Dec 2005 11:47:07 -0000 1.3
@@ -1,4 +1,6 @@
#!/bin/bash
+# requires /var/cache/pbuilder/base-sarge.tgz
+
log_success () {
CODE=$?
@@ -22,10 +24,12 @@
(
cd regression && \
- for A in *.sh; do
+ for A in $(ls -1 *.sh | sort -n); do
OUTPUT_LOGNAME=log/$A.log bash $A
log_success $A
done
)
sudo rm -rf regression/work/
+echo '### RESULT: ###'
+cat "${RESULTFILE}"
1.2 +1 -0 pbuilder/testsuite/run-regression.log
CVSWEB Options: -------------------
CVSWeb: Annotate this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-regression.log?annotate=1.2&cvsroot=
CVSWeb: View this file: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-regression.log?rev=1.2&content-type=text/x-cvsweb-markup&cvsroot=
CVSWeb: Diff to previous version: http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/testsuite/run-regression.log.diff?r1=1.2&r2=1.1&cvsroot=
-----------------------------------
Index: run-regression.log
===================================================================
RCS file: /cvsroot/pbuilder/pbuilder/testsuite/run-regression.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run-regression.log 12 Dec 2005 00:32:40 -0000 1.1
+++ run-regression.log 21 Dec 2005 11:47:07 -0000 1.2
@@ -1 +1,2 @@
[OK] 342665-pbuilder-ccache.sh
+[OK] 344089-initscripts-inetd-workaround-check.sh
More information about the Pbuilder-maint
mailing list