From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 31 Mar 2008 15:00:53 +0000 (+0000)
Subject: reflect test mode (chroot/vserver) in test dirname
X-Git-Tag: 4.2-rc2~73
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=51708444fe3c1f23c95dc293dd45a85c2a5b11cc;p=build.git

reflect test mode (chroot/vserver) in test dirname
---

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index ed9a3e24..e72afc60 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -171,7 +171,9 @@ function runtest () {
     url=$(echo $rpm | sed -e "s,/vservers/$BASE/build,${TESTBUILDURL}${PLDISTRO}/${BASE},")
 
     # compute test directory name on test box
-    testdir=test-${BASE}
+    testdir=chroot-${BASE}
+    # use another name if any config contains vserver
+    echo $TESTCONFIG | grep vserver &> /dev/null && testdir=vserver-${BASE}
     # clean it
     ssh ${TESTBOXSSH} rm -rf ${testdir}
     # check it out