summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-06-18 03:08:21 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-06-18 03:08:21 +0200
commita5563d29255672c348bf435d0cb18cb26f900e53 (patch)
treec2b082bd46382a877c07be569f8cbd547e9b9167 /source4/selftest
parent4e293e37803d63fc3fc9094f3a2b84758cad5c09 (diff)
downloadsamba-a5563d29255672c348bf435d0cb18cb26f900e53.tar.gz
samba-a5563d29255672c348bf435d0cb18cb26f900e53.tar.bz2
samba-a5563d29255672c348bf435d0cb18cb26f900e53.zip
selftest: Use common function when skipping testsuites based on run-time
conditions.
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/tests.sh43
1 files changed, 32 insertions, 11 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 56462ac097..70fc99467f 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -43,12 +43,32 @@ plantest() {
echo $cmdline
}
+skiptestsuite() {
+ name=$1
+ reason=$2
+ shift 2
+ # FIXME: Report this using subunit, but re-adjust the testsuite count somehow
+ echo "skipping $name ($reason)"
+}
+
normalize_testname() {
name=$1
shift 1
echo $name | tr "A-Z-" "a-z."
}
+planperltest() {
+ name=$1
+ env=$2
+ shift 2
+ cmdline="$*"
+ if $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
+ plantest "$name" "$env" $PERL $cmdline "|" $TAP2SUBUNIT
+ else
+ skiptestsuite "$name" "Test::More not available"
+ fi
+}
+
plansmbtorturetest() {
name=$1
env=$2
@@ -109,7 +129,12 @@ done
# is now pretty well tested by the rest of the quick tests anyway
LDBDIR=$samba4srcdir/lib/ldb
export LDBDIR
-plantest "ldb" none TEST_DATA_PREFIX=\$PREFIX $LDBDIR/tests/test-tdb.sh
+# Don't run LDB tests when using system ldb, as we won't have ldbtest installed
+if [ -f $samba4bindir/ldbtest ]; then
+ plantest "ldb" none TEST_DATA_PREFIX=\$PREFIX $LDBDIR/tests/test-tdb.sh
+else
+ skiptestsuite "ldb" "Using system LDB, ldbtest not available"
+fi
# Tests for RPC
@@ -284,20 +309,16 @@ tdbtorture4="$samba4bindir/tdbtorture${EXEEXT}"
if test -f $tdbtorture4
then
plantest "tdb.stress" none $VALGRIND $tdbtorture4
+else
+ skiptestsuite "tdb.stress" "Using system TDB, tdbtorture not available"
fi
# Pidl tests
-if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
- echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
-elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
- for f in $samba4srcdir/../pidl/tests/*.pl; do
- plantest "pidl.`basename $f .pl`" none $PERL $f "|" $TAP2SUBUNIT
- done
- plantest "selftest.samba4.pl" none $PERL $samba4srcdir/../selftest/test_samba4.pl "|" $TAP2SUBUNIT
-else
- echo "Skipping pidl tests - Test::More not installed"
-fi
+for f in $samba4srcdir/../pidl/tests/*.pl; do
+ planperltest "pidl.`basename $f .pl`" none $f
+done
+planperltest "selftest.samba4.pl" none $samba4srcdir/../selftest/test_samba4.pl
# Blackbox Tests:
# tests that interact directly with the command-line tools rather than using