summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2013-09-06 06:49:09 -0700
committerVijay Bellur <vbellur@redhat.com>2013-09-06 06:49:49 -0700
commit94fdc3dd79fa052ba3eb8951fe5c4ddf9dd1c6e8 (patch)
tree9d9d7ddadebc1ce2a6a1d89de145bc2378bf746d
parent91e8103794349ebdd578b77987a089456a59c52b (diff)
Revert "tests/basic/rpm.t: run mock builds in parallel"
This reverts commit 91e8103794349ebdd578b77987a089456a59c52b Reverting as regression tests are failing after this merge. Change-Id: I9dcd430b2f9a431c3c01deab1a205aed297216a3 Reviewed-on: http://review.gluster.org/5842 Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Vijay Bellur <vbellur@redhat.com>
-rwxr-xr-xtests/basic/rpm.t15
1 files changed, 5 insertions, 10 deletions
diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t
index d8acd8a..ef4b5ab 100755
--- a/tests/basic/rpm.t
+++ b/tests/basic/rpm.t
@@ -59,6 +59,8 @@ chmod g=rwx ${RESULT_DIR}
chown :mock ${RESULT_DIR}
# build for the last two Fedora EPEL releases (x86_64 only)
+# TAP/Prove aren't smart about loops
+TESTS_EXPECTED_IN_LOOP=2
for MOCK_CONF in $(ls -x1 /etc/mock/*.cfg | egrep -e 'epel-[0-9]+-x86_64.cfg$' | tail -n2)
do
EPEL_RELEASE=$(basename ${MOCK_CONF} .cfg)
@@ -81,23 +83,16 @@ EOF
if (groups | grep -q mock)
then
# the current user is in group 'mock'
- ${RESULT_DIR}/${EPEL_RELEASE}/mock.sh 2>&1 > ${RESULT_DIR}/${EPEL_RELEASE}.out &
+ RUNMOCK="${RESULT_DIR}/${EPEL_RELEASE}/mock.sh"
else
# switch to the user called 'mock'
chown mock:mock ${RESULT_DIR}/${EPEL_RELEASE}
# "su" might not work, using sudo instead
- sudo -u mock -E ${RESULT_DIR}/${EPEL_RELEASE}/mock.sh 2>&1 > ${RESULT_DIR}/${EPEL_RELEASE}.out &
+ RUNMOCK="sudo -u mock -E ${RESULT_DIR}/${EPEL_RELEASE}/mock.sh"
fi
- sleep 5
+ TEST_IN_LOOP ${RUNMOCK}
done
-# TAP/Prove aren't smart about loops
-TESTS_EXPECTED_IN_LOOP=2
-for mockjob in `jobs -p`; do
- TEST_IN_LOOP wait $mockjob
-done
-
-
# we could build for the last two Fedora releases too, but that is not
# possible on EPEL-5/6 installations, Fedora 17 and newer have unmet
# dependencies on the build-server :-/