aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2006-01-24 10:01:49 +0000
committerdancer <dancer>2006-01-24 10:01:49 +0000
commit84d60e5f044216b7c001a1c658ec2eeac594ddf6 (patch)
tree436ef447b859f8f59601222e33e8131e42847348
parentffbd933094399750964a5ccd05549a448cab63a2 (diff)
downloadpbuilder-84d60e5f044216b7c001a1c658ec2eeac594ddf6.tar
pbuilder-84d60e5f044216b7c001a1c658ec2eeac594ddf6.tar.gz
* improve B92test-pkg: cd to package build directory before invoking
test scripts.
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog5
-rw-r--r--examples/B92test-pkg8
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a33d590..1d0a09e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-24 Junichi Uekawa <dancer@debian.org>
+
+ * examples/B92test-pkg: improve the script a bit; do not fail if
+ apt-get install of a previous version fails, and cd to the package
+ directory before test starts.
+
2006-01-13 Junichi Uekawa <dancer@debian.org>
* debian/TODO: update notes on cowdancer.
diff --git a/debian/changelog b/debian/changelog
index 11d2c6c..ae9d49e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
pbuilder (0.146) UNRELEASED; urgency=low
- *
+ * improve B92test-pkg: cd to package build directory before invoking
+ test scripts.
- -- Junichi Uekawa <dancer@debian.org> Fri, 13 Jan 2006 21:18:53 +0900
+ -- Junichi Uekawa <dancer@debian.org> Tue, 24 Jan 2006 19:00:44 +0900
pbuilder (0.145) unstable; urgency=low
diff --git a/examples/B92test-pkg b/examples/B92test-pkg
index 078e62f..40f25a4 100644
--- a/examples/B92test-pkg
+++ b/examples/B92test-pkg
@@ -5,9 +5,10 @@ set -e
echo "Installing the prerequisites"
for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
- apt-get install -y --force-yes "$PKG"
- apt-get remove -y "$PKG"
+ apt-get install -y --force-yes "$PKG" || true
+ apt-get remove -y "$PKG" || true
done
+# ignore the failures since they are not the prime interest
dpkg -i /tmp/buildd/*.deb
@@ -17,6 +18,9 @@ COUNT=0
unset FAIL || true
NOFAIL=1
+# make current directory a better place to live.
+cd /tmp/buildd/*/debian/..
+
for SCRIPT in $(run-parts --test /tmp/buildd/*/debian/pbuilder-test) ; do
echo "--- BEGIN test: ${SCRIPT##*/}"
if "${SCRIPT}"; then