From 7f162316f074f19cfecca9197060e4e687658345 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 23 Apr 2013 12:57:40 -0400 Subject: build: sync glusterfs.spec.in with Fedora glusterfs.spec BUG: 819130 Change-Id: I96aeb8fbe8b79bbc058ff9a45167d822abb576ed Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/4877 Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- tests/basic/rpm.t | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t index 9887a200e30..6b8c310d4dc 100755 --- a/tests/basic/rpm.t +++ b/tests/basic/rpm.t @@ -60,6 +60,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) @@ -82,13 +84,14 @@ EOF if (groups | grep -q mock) then # the current user is in group 'mock' - TEST ${RESULT_DIR}/${EPEL_RELEASE}/mock.sh + 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 - TEST sudo -u mock -E ${RESULT_DIR}/${EPEL_RELEASE}/mock.sh + RUNMOCK="sudo -u mock -E ${RESULT_DIR}/${EPEL_RELEASE}/mock.sh" fi + TEST_IN_LOOP ${RUNMOCK} done # we could build for the last two Fedora releases too, but that is not -- cgit