summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-03 18:42:55 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-09-03 19:24:10 +1000
commit3ad9c52b1471da7192aa39f878d3ec22ea52d665 (patch)
treeaf68acc30d47c1b312d9c888ce3320dfb2ed3db7 /testprogs
parent05f9829ab54a4c1a9c23e0283a785a29bf1fc383 (diff)
downloadsamba-3ad9c52b1471da7192aa39f878d3ec22ea52d665.tar.gz
samba-3ad9c52b1471da7192aa39f878d3ec22ea52d665.tar.bz2
samba-3ad9c52b1471da7192aa39f878d3ec22ea52d665.zip
selftest: skip tests if the tarball did not include the alpha13 provision
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/dbcheck-alpha13.sh34
1 files changed, 28 insertions, 6 deletions
diff --git a/testprogs/blackbox/dbcheck-alpha13.sh b/testprogs/blackbox/dbcheck-alpha13.sh
index 00cb97a48f..a028116075 100755
--- a/testprogs/blackbox/dbcheck-alpha13.sh
+++ b/testprogs/blackbox/dbcheck-alpha13.sh
@@ -12,12 +12,14 @@ shift 1
. `dirname $0`/subunit.sh
+alpha13_dir=`dirname $0`/../../source4/selftest/provisions/alpha13
+
alpha13() {
if test -x $BINDIR/tdbrestore;
then
- `dirname $0`/../../source4/selftest/provisions/undump.sh `dirname $0`/../../source4/selftest/provisions/alpha13 $PREFIX_ABS/alpha13 $BINDIR/tdbrestore
+ `dirname $0`/../../source4/selftest/provisions/undump.sh $alpha13_dir $PREFIX_ABS/alpha13 $BINDIR/tdbrestore
else
- `dirname $0`/../../source4/selftest/provisions/undump.sh `dirname $0`/../../source4/selftest/provisions/alpha13 $PREFIX_ABS/alpha13
+ `dirname $0`/../../source4/selftest/provisions/undump.sh $alpha13_dir $PREFIX_ABS/alpha13
fi
}
@@ -34,9 +36,29 @@ dbcheck_clean() {
$BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/alpha13/private/sam.ldb $@
}
-testit "alpha13" alpha13
-testit "reindex" reindex
-testit_expect_failure "dbcheck" dbcheck
-testit "dbcheck_clean" dbcheck_clean
+if [ -d $alpha13_dir ]; then
+ testit "alpha13" alpha13
+ testit "reindex" reindex
+ testit_expect_failure "dbcheck" dbcheck
+ testit "dbcheck_clean" dbcheck_clean
+else
+ subunit_start_test "alpha13"
+ subunit_skip_test "alpha13" <<EOF
+no test provision
+EOF
+
+ subunit_start_test "reindex"
+ subunit_skip_test "reindex" <<EOF
+no test provision
+EOF
+ subunit_start_test "dbcheck"
+ subunit_skip_test "dbcheck" <<EOF
+no test provision
+EOF
+ subunit_start_test "dbcheck_clean"
+ subunit_skip_test "dbcheck_clean" <<EOF
+no test provision
+EOF
+fi
exit $failed