summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2012-12-19 16:40:11 +0100
committerAnand Avati <avati@redhat.com>2012-12-19 13:10:34 -0800
commit6b0d888e0729e7f7922d9b0a76dc27bae724e812 (patch)
tree627ea702d5a43d7b8e6bba7c2a9b722774cab1f9
parente8c75fd92974285be6aa9df542a1a8d7f6309160 (diff)
tests: let basic/rpm.t cleanup after itself when not in DEBUG-mode
The temporary working directory unders /var/tmp is not cleaned when debugging of the test is disabled. The logic should be the othetr way around. With this correction, the output while running is reduced as well. Nothing of the output contains useful information and clutters the testing output for no reason. BUG: 888743 Change-Id: Id7616ad41873f61fd5d435b380f98068f313d5a6 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/4340 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rwxr-xr-xtests/basic/rpm.t8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t
index 7ef9ac570..45818ef68 100755
--- a/tests/basic/rpm.t
+++ b/tests/basic/rpm.t
@@ -17,11 +17,11 @@ REPO=${PWD}
COMMIT=$(git describe)
mkdir ${RESULT_DIR}/sources
cd ${RESULT_DIR}/sources
-git clone -s file://${REPO} .
-git checkout ${COMMIT}
+git clone -q -s file://${REPO} .
+git checkout -q -b rpm-test ${COMMIT}
# build the .tar.gz
-[ -e configure ] || ./autogen.sh
+[ -e configure ] || ./autogen.sh 2>&1 > /dev/null
TEST ./configure --enable-fusermount
TEST make dist
@@ -72,7 +72,7 @@ done
# dependencies on the build-server :-/
# only remove ${RESULT_DIR} if we're not debugging
-[ "${DEBUG}" != "0" ] && rm -rf ${RESULT_DIR}
+[ "${DEBUG}" = "0" ] && rm -rf ${RESULT_DIR}
cleanup