diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Documentation/pbuilder-doc.xml | 4 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rwxr-xr-x | testsuite/run-test-uml.sh | 35 | ||||
| -rwxr-xr-x | testsuite/run-test.sh | 27 |
5 files changed, 66 insertions, 14 deletions
@@ -1,5 +1,11 @@ 2004-01-11 Junichi Uekawa <dancer@debian.org> + * testsuite/run-test.sh: change to pbuilder test, instead of UML. + + * testsuite/run-test-uml.sh: split out UML test + + * README: tried updating the documentation. + * Documentation/pbuilder-doc.css: Change css so that it's black on white, not white on black. 2004-01-10 Junichi Uekawa <dancer@debian.org> diff --git a/Documentation/pbuilder-doc.xml b/Documentation/pbuilder-doc.xml index 3e919b8..f82c947 100644 --- a/Documentation/pbuilder-doc.xml +++ b/Documentation/pbuilder-doc.xml @@ -982,8 +982,8 @@ read <sect2> <title>Birth of pbuilder</title> <para> - wanna-build (sbuild) was quite difficult to set up, and it was - never a Debian package. dbuild was something that predated + wanna-build (sbuild) was (at the time of year 2001) quite difficult to + set up, and it was never a Debian package. dbuild was something that predated Build-Depends. </para> <para> @@ -8,6 +8,12 @@ AUTHORS and THANKS, for the list of people who have been working on this. The man pages pbuilder.8, pbuilderrc.5, and pdebuild.1 should give some info on how to use pbuilder. +There is a DocBook documentation, translated to html format, +pbuilder-doc.html. It is the most complete documentation of pbuilder available. + Junichi Uekawa. -30 Sep 2001 Midnight.
\ No newline at end of file +Initially, 30 Sep 2001 Midnight. +Updated on 11 Jan 2004 + +$Id$
\ No newline at end of file diff --git a/testsuite/run-test-uml.sh b/testsuite/run-test-uml.sh new file mode 100755 index 0000000..70fd352 --- /dev/null +++ b/testsuite/run-test-uml.sh @@ -0,0 +1,35 @@ +#!/bin/sh +# This is a testsuite. +# estimated run-time on my PC; 45 minutes. + +PBUILDER_UML=/usr/bin/pbuilder-user-mode-linux + +pbuilder-user-mode-linux test --configfile non-existing-configfile + +if [ -x "${PBUILDER_UML}" ]; then + for distribution in sid sarge; do + pbuilder-user-mode-linux create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --uml-image $(pwd)/testimage --logfile pbuilder-user-mode-linux-create-${distribution}.log + + for PKG in dsh; do + ( + mkdir testbuild + cd testbuild + apt-get source -d ${PKG} + ) + pbuilder-user-mode-linux build --uml-image $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile pbuilder-user-mode-linux-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc + ( + mkdir testbuild2 + cd testbuild2 + apt-get source ${PKG} + cd ${PKG}-* + pdebuild-user-mode-linux --logfile ../../pdebuild-user-mode-linux-normal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/ + pdebuild-user-mode-linux --use-pdebuild-internal --logfile ../../pdebuild-user-mode-linux-internal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/ + ) + done + pbuilder-user-mode-linux execute --uml-image $(pwd)/testimage --logfile pbuilder-user-mode-linux-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3 + rm -rf testbuild testbuild2 testimage + done +fi + + + diff --git a/testsuite/run-test.sh b/testsuite/run-test.sh index 70fd352..e92295a 100755 --- a/testsuite/run-test.sh +++ b/testsuite/run-test.sh @@ -1,14 +1,19 @@ #!/bin/sh # This is a testsuite. -# estimated run-time on my PC; 45 minutes. +# estimated run-time on my PC; ?? minutes. -PBUILDER_UML=/usr/bin/pbuilder-user-mode-linux +PBUILDER=/usr/bin/pbuilder -pbuilder-user-mode-linux test --configfile non-existing-configfile +vmstat -n 1 > vmstat & +VMSTATPID=$! +LC_ALL=C iostat -dxt hda > iostat & +IOSTATPID=$! -if [ -x "${PBUILDER_UML}" ]; then +sudo pbuilder test --configfile non-existing-configfile + +if [ -x "${PBUILDER}" ]; then for distribution in sid sarge; do - pbuilder-user-mode-linux create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --uml-image $(pwd)/testimage --logfile pbuilder-user-mode-linux-create-${distribution}.log + sudo ${PBUILDER} create --mirror http://ring.asahi-net.or.jp/archives/linux/debian/debian --distribution "${distribution}" --basetgz $(pwd)/testimage --logfile ${PBUILDER}-create-${distribution}.log for PKG in dsh; do ( @@ -16,20 +21,20 @@ if [ -x "${PBUILDER_UML}" ]; then cd testbuild apt-get source -d ${PKG} ) - pbuilder-user-mode-linux build --uml-image $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile pbuilder-user-mode-linux-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc + sudo ${PBUILDER} build --basetgz $(pwd)/testimage --buildplace $(pwd)/testbuild/ --logfile pbuilder-build-${PKG}-${distribution}.log testbuild/${PKG}*.dsc ( mkdir testbuild2 cd testbuild2 apt-get source ${PKG} cd ${PKG}-* - pdebuild-user-mode-linux --logfile ../../pdebuild-user-mode-linux-normal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/ - pdebuild-user-mode-linux --use-pdebuild-internal --logfile ../../pdebuild-user-mode-linux-internal-${distribution}.log -- --uml-image $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/ + pdebuild --logfile ../../pdebuild-normal-${distribution}.log -- --basetgz $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/ + pdebuild --use-pdebuild-internal --logfile ../../pdebuild-internal-${distribution}.log -- --basetgz $(pwd)/../../testimage --buildplace $(pwd)/../../testbuild2/ ) done - pbuilder-user-mode-linux execute --uml-image $(pwd)/testimage --logfile pbuilder-user-mode-linux-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3 + sudo ${PBUILDER} execute --basetgz $(pwd)/testimage --logfile pbuilder-execute-${distribution}.log ../examples/execute_paramtest.sh test1 test2 test3 rm -rf testbuild testbuild2 testimage done fi - - +kill $VMSTATPID +kill $IOSTATPID |