From 3df72ddcdb371c441b5535ad802fc59a794e3ac9 Mon Sep 17 00:00:00 2001 From: Jose Castillo Date: Tue, 1 Jul 2014 15:51:07 +0200 Subject: Avoid hard-coded x86_64 arch in tests/basic/rpm.t tests/basic/rpm.t hard-codes x86_64 to pick the build-root for mock, causing errors when called from a different architecture. With this patch, we use 'uname -i' to select the right architecture. v2: Fixed typo as suggested by Justin Clift. Change-Id: I07bc2af9317dc315bca460149ea3430071537780 BUG: 962169 Signed-off-by: Jose Castillo Reviewed-on: http://review.gluster.org/8214 Reviewed-by: Vikhyat Umrao Reviewed-by: Justin Clift Reviewed-by: Humble Devassy Chirammal Tested-by: Gluster Build System Reviewed-by: Lalatendu Mohanty Reviewed-by: Vijay Bellur --- tests/basic/rpm.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t index cea56ced6a3..bdc23b2d04f 100755 --- a/tests/basic/rpm.t +++ b/tests/basic/rpm.t @@ -75,8 +75,8 @@ TEST make dist # build the glusterfs src.rpm TEST build_srpm_from_tgz ${PWD}/*.tar.gz -# build for the last two Fedora EPEL releases (x86_64 only) -for MOCK_CONF in $(ls -x1 /etc/mock/*.cfg | egrep -e 'epel-[0-9]+-x86_64.cfg$' | tail -n2) +# even though the last two Fedora EPEL releases are x86_64 only, we allow other arches to build +for MOCK_CONF in $(ls -x1 /etc/mock/*.cfg | egrep -e 'epel-[0-9]+-'`uname -i`'.cfg$' | tail -n2) do EPEL_RELEASE=$(basename ${MOCK_CONF} .cfg) mkdir -p "${PWD}/mock.d/${EPEL_RELEASE}" -- cgit