andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Removing rpmbuild/mock check from run-tests.sh

Browse Source 
Checks for rpmbuild/mock is removed from run-tests since this check
is not in the glusterfs-regression-tests package.
Alongside, the dependency mock is also removed from glusterfs.spec.in
as mock is only used by basic/rpm.t.

Change-Id: I5a9036141d0900b3a0bedd95b8c58fb0cdc13ca1
BUG: 1178008
Signed-off-by: Nandaja Varma <nvarma@redhat.com>
Reviewed-on: http://review.gluster.org/9512
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Lalatendu Mohanty <lmohanty@redhat.com>
Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Nandaja Varma 2015-01-30 14:17:23 +05:30 committed by Niels de Vos
parent b05b779239
commit 7842f86a5c
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glusterfs.spec.in
View File

@ -411,7 +411,7 @@ Requires: %{name}-server = %{version}-%{release}
## thin provisioning support
Requires: lvm2 >= 2.02.89
Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng
Requires: python attr dbench file git libacl-devel mock net-tools
Requires: python attr dbench file git libacl-devel net-tools
Requires: nfs-utils xfsprogs yajl
%description regression-tests
@ -1030,6 +1030,9 @@ fi
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%changelog
* Fri Jan 30 2015 Nandaja Varma <nvarma@redhat.com>
- remove checks for rpmbuild/mock from run-tests.sh (#178008)
* Fri Jan 16 2015 Niels de Vos <ndevos@redhat.com>
- add support for /run/gluster through a tmpfiles.d config file (#1182934)

14
run-tests.sh
View File

@ -20,20 +20,6 @@ function check_dependencies()
MISSING="$MISSING git"
fi
# basic/rpm.t uses mock, which assumes Linux as the OS
if [ "x`uname -s`" = "xLinux" ] ; then
# Check for mock
if [ ! -e /usr/bin/mock ]; then
MISSING="$MISSING mock"
fi
# Check for rpmbuild
env rpmbuild --version > /dev/null 2>&1
if [ $? -ne 0 ]; then
MISSING="$MISSING rpmbuild"
fi
fi
# Check for nfs-utils (Linux-only: built-in NetBSD with different name)
if [ "x`uname -s`" = "xLinux" ] ; then
env mount.nfs -V > /dev/null 2>&1