summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2014-07-10 15:39:43 +0200
committerJoachim Breitner <mail@joachim-breitner.de>2014-07-10 15:39:43 +0200
commitf13700d2e00943f4a468af41b00c6de10194e01c (patch)
tree457fec57e9a7ec62e161b7cd3951d9bc792eb385
parentc14874ef3b351c6ee175a15f776e9eb88d6f5aff (diff)
downloadjenkins.debian.net-f13700d2e00943f4a468af41b00c6de10194e01c.tar.xz
Copy stats.csv in cleanup
-rwxr-xr-xbin/chroot-run.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh
index 577fc62c..53b16003 100755
--- a/bin/chroot-run.sh
+++ b/bin/chroot-run.sh
@@ -66,6 +66,12 @@ EOF
}
cleanup() {
+ # hack to get data out of the chroot, used by haskell-package-plan
+ if [ -e $CHROOT_TARGET/tmp/testrun/stats.csv ]
+ then
+ cp -v $CHROOT_TARGET/tmp/testrun/stats.csv $CURDIR
+ fi
+
if [ -d $CHROOT_TARGET/proc ]; then
sudo umount -l $CHROOT_TARGET/proc || fuser -mv $CHROOT_TARGET/proc
fi
@@ -100,11 +106,6 @@ EOF
chmod +x $CHROOT_TARGET/tmp/chroot-testrun
sudo chroot $CHROOT_TARGET /tmp/chroot-testrun
- # hack to get data out of the chroot, used by haskell-package-plan
- if [ -e $CHROOT_TARGET/tmp/testrun/stats.csv ]
- then
- cp -v $CHROOT_TARGET/tmp/testrun/stats.csv $CURDIR
- fi
}
bootstrap