summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2013-03-26 15:30:48 -0400
committerAnand Avati <avati@redhat.com>2013-03-26 18:28:54 -0700
commit20b1be77f6cd7ddebedb0cc64d419b5686e5d56e (patch)
treec3907d67693e0702c60caade2cd4526efa6c4f82 /tests
parent7470c18bdd46356e69716721299c6f71aee5d1f2 (diff)
glusterfs.spec.in: resync with Fedora glusterfs.spec
cherry-pick from master, including commits: 5d3b478e76f1015b11bfd7d48465ab12a4f0737e fd407a4f5cdb869dc52efe8fc9e1d284f60f5992 6f6789884227b8260f140c39c063d77b0516af97 84f5e4b354526fbb7f0665345816e81c81245c8f 2398e1e0da61f4ec5f209c704e037b54b5c249e1 Resync with Fedora's glusterfs.spec To build a set of RPMs: % ./autogen.sh % ./configure --enable-fusermount % make dist % cd extras/LinuxRPM && make glusterrpms Updated rpm.t BUG: 819130 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Change-Id: Ib73be0fbb7ee16a5c41b4f7c7a3f66d0224bfe6c Reviewed-on: http://review.gluster.org/4725 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic/rpm.t13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t
index f78549810..9887a200e 100755
--- a/tests/basic/rpm.t
+++ b/tests/basic/rpm.t
@@ -45,17 +45,16 @@ cd ${RESULT_DIR}/sources
git clone -q -s file://${REPO} .
git checkout -q -b rpm-test ${COMMIT}
-# build the .tar.gz
+# build the glusterfs-*.tar.gz and gluster-swift-ufo-*.tar.gz
[ -e configure ] || ./autogen.sh 2>&1 > /dev/null
TEST ./configure --enable-fusermount
+pwd
TEST make dist
+ls *.tar.gz
-# need to use double quoting because the command is passed to TEST
-# EPEL-5 does not like new versions of rpmbuild and requires some _source_* defines
-TEST rpmbuild --define "'_srcrpmdir $PWD'" \
- --define "'_source_payload w9.gzdio'" \
- --define "'_source_filedigest_algorithm 1'" \
- -ts *.tar.gz
+# build the glusterfs src.rpm
+ls extras
+TEST make -C extras/LinuxRPM testsrpm
chmod g=rwx ${RESULT_DIR}
chown :mock ${RESULT_DIR}