summaryrefslogtreecommitdiffstats
path: root/run-tests.sh
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2014-10-31 09:26:28 +0100
committerNiels de Vos <ndevos@redhat.com>2014-10-31 03:50:05 -0700
commit756949556b3ceb2279f09962ab5789960de86bd3 (patch)
tree32474c99e9a9e06e7f132d77434c3b3705e763e7 /run-tests.sh
parenta718a11a1c21c1f74460b61c98579db4ae2747ac (diff)
Regression test portability: mock
After some attempts at using mock on NetBSD which pulled a lot of dependencies, it seems that software really assumes the OS is Linux: chrooted build will fail because of missing Linux files. As a result, make tests/basic/rpm.t Linux-only, and remove mock and rpmbuild checks for non Linux systems. BUG: 1129939 Change-Id: Ica2eb74dd23fbec379a26051a8f61b0dfc07a115 Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8949 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'run-tests.sh')
-rwxr-xr-xrun-tests.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/run-tests.sh b/run-tests.sh
index f95c8f9..aabf1da 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -20,15 +20,18 @@ function check_dependencies()
MISSING="$MISSING git"
fi
- # Check for mock
- if [ ! -e /usr/bin/mock ]; then
- MISSING="$MISSING mock"
- 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"
+ # 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)