[SCM] Samba Shared Repository - branch master updated
Pavel Filipensky
pfilipensky at samba.org
Wed Jul 20 12:00:01 UTC 2022
The branch, master has been updated
via 4c12840e42b testprogs: Reformat common_test_fns.inc
via 88c1173655f testprogs: Reformat common-links.sh
from f340b884724 waf: Check for -Wno-error=array-bounds flags
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4c12840e42bde55c756851d38baea84b6a64823c
Author: Andreas Schneider <asn at samba.org>
Date: Wed Jun 8 14:49:51 2022 +0200
testprogs: Reformat common_test_fns.inc
shfmt -w -p -i 0 -fn testprogs/blackbox/common_test_fns.inc
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
Autobuild-User(master): Pavel Filipensky <pfilipensky at samba.org>
Autobuild-Date(master): Wed Jul 20 11:59:26 UTC 2022 on sn-devel-184
commit 88c1173655f7321a7c594cdfed505fd8b6b0d81f
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 22 15:46:04 2022 +0200
testprogs: Reformat common-links.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/common-links.sh
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky at samba.org>
-----------------------------------------------------------------------
Summary of changes:
testprogs/blackbox/common-links.sh | 393 +++++++++++++++++----------------
testprogs/blackbox/common_test_fns.inc | 28 ++-
2 files changed, 222 insertions(+), 199 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testprogs/blackbox/common-links.sh b/testprogs/blackbox/common-links.sh
index 363234ae11c..92cf730ffc0 100644
--- a/testprogs/blackbox/common-links.sh
+++ b/testprogs/blackbox/common-links.sh
@@ -2,216 +2,233 @@ release_dir=$SRCDIR_ABS/source4/selftest/provisions/$RELEASE
ldbadd="ldbadd"
if [ -x "$BINDIR/ldbadd" ]; then
- ldbadd="$BINDIR/ldbadd"
+ ldbadd="$BINDIR/ldbadd"
fi
ldbmodify="ldbmodify"
if [ -x "$BINDIR/ldbmodify" ]; then
- ldbmodify="$BINDIR/ldbmodify"
+ ldbmodify="$BINDIR/ldbmodify"
fi
ldbdel="ldbdel"
if [ -x "$BINDIR/ldbdel" ]; then
- ldbdel="$BINDIR/ldbdel"
+ ldbdel="$BINDIR/ldbdel"
fi
ldbsearch="ldbsearch"
if [ -x "$BINDIR/ldbsearch" ]; then
- ldbsearch="$BINDIR/ldbsearch"
+ ldbsearch="$BINDIR/ldbsearch"
fi
ldbrename="ldbrename"
if [ -x "$BINDIR/ldbrename" ]; then
- ldbrename="$BINDIR/ldbrename"
+ ldbrename="$BINDIR/ldbrename"
fi
samba_tdbrestore="tdbrestore"
if [ -x "$BINDIR/tdbrestore" ]; then
- samba_tdbrestore="$BINDIR/tdbrestore"
+ samba_tdbrestore="$BINDIR/tdbrestore"
fi
samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh"
-undump() {
- $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore
-}
-
-add_dangling_link() {
- ldif=$release_dir/add-dangling-forwardlink-user.ldif
- TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/add-initially-normal-link.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/delete-only-backlink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_dangling_backlink() {
- ldif=$release_dir/add-dangling-backlink-user.ldif
- TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/add-dangling-backlink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_deleted_dangling_backlink() {
- ldif=$release_dir/add-deleted-backlink-user.ldif
- TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/add-deleted-backlink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_deleted_target_backlink() {
- ldif=$release_dir/add-deleted-target-backlink-user.ldif
- TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/add-deleted-target-backlink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-revive_links_on_deleted_group() {
- ldif=$release_dir/revive-links-on-deleted-group.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-revive_backlink_on_deleted_group() {
- ldif=$release_dir/revive-backlink-on-deleted-group.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_deleted_target_link() {
- ldif=$release_dir/add-dangling-deleted-link.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_two_more_users() {
- ldif=$release_dir/add-two-more-users.ldif
- TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_four_more_links() {
- ldif=$release_dir/add-four-more-links.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-remove_one_link() {
- ldif=$release_dir/remove-one-more-link.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-remove_one_user() {
- ldif=$release_dir/remove-one-more-user.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-move_one_user() {
- TZ=UTC $ldbrename -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb 'cn=user1,cn=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' 'cn=user1x,cn=users,DC=release-4-5-0-pre1,DC=samba,DC=corp'
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-dangling_one_way_dn() {
- ldif=$release_dir/dangling-one-way-dn.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-deleted_one_way_dn() {
- ldif=$release_dir/deleted-one-way-dn.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-dangling_one_way_link() {
- ldif=$release_dir/dangling-one-way-link.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/CN%3DCONFIGURATION,DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-}
-
-add_dangling_multi_valued() {
- # multi1 - All 4 backlinks
- # multi2 - Missing all 4 backlinks
- # multi3 - Missing 2 backlinks
- # Administrator - Has 2 too many backlinks
- # multi5 - Has 2 backlinks but no forward links
- ldif=$release_dir/add-dangling-multilink-users.ldif
- TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/add-initially-normal-multilink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/delete-only-multi-backlink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
-
- ldif=$release_dir/add-dangling-multi-backlink.ldif
- TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
- if [ "$?" != "0" ]; then
- return 1
- fi
+undump()
+{
+ $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore
+}
+
+add_dangling_link()
+{
+ ldif=$release_dir/add-dangling-forwardlink-user.ldif
+ TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/add-initially-normal-link.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/delete-only-backlink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_dangling_backlink()
+{
+ ldif=$release_dir/add-dangling-backlink-user.ldif
+ TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/add-dangling-backlink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_deleted_dangling_backlink()
+{
+ ldif=$release_dir/add-deleted-backlink-user.ldif
+ TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/add-deleted-backlink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_deleted_target_backlink()
+{
+ ldif=$release_dir/add-deleted-target-backlink-user.ldif
+ TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/add-deleted-target-backlink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+revive_links_on_deleted_group()
+{
+ ldif=$release_dir/revive-links-on-deleted-group.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+revive_backlink_on_deleted_group()
+{
+ ldif=$release_dir/revive-backlink-on-deleted-group.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_deleted_target_link()
+{
+ ldif=$release_dir/add-dangling-deleted-link.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_two_more_users()
+{
+ ldif=$release_dir/add-two-more-users.ldif
+ TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_four_more_links()
+{
+ ldif=$release_dir/add-four-more-links.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+remove_one_link()
+{
+ ldif=$release_dir/remove-one-more-link.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+remove_one_user()
+{
+ ldif=$release_dir/remove-one-more-user.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+move_one_user()
+{
+ TZ=UTC $ldbrename -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb 'cn=user1,cn=users,DC=release-4-5-0-pre1,DC=samba,DC=corp' 'cn=user1x,cn=users,DC=release-4-5-0-pre1,DC=samba,DC=corp'
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+dangling_one_way_dn()
+{
+ ldif=$release_dir/dangling-one-way-dn.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+deleted_one_way_dn()
+{
+ ldif=$release_dir/deleted-one-way-dn.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+dangling_one_way_link()
+{
+ ldif=$release_dir/dangling-one-way-link.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/CN%3DCONFIGURATION,DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+}
+
+add_dangling_multi_valued()
+{
+ # multi1 - All 4 backlinks
+ # multi2 - Missing all 4 backlinks
+ # multi3 - Missing 2 backlinks
+ # Administrator - Has 2 too many backlinks
+ # multi5 - Has 2 backlinks but no forward links
+ ldif=$release_dir/add-dangling-multilink-users.ldif
+ TZ=UTC $ldbadd -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/add-initially-normal-multilink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/delete-only-multi-backlink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
+
+ ldif=$release_dir/add-dangling-multi-backlink.ldif
+ TZ=UTC $ldbmodify -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb.d/DC%3DRELEASE-4-5-0-PRE1,DC%3DSAMBA,DC%3DCORP.ldb $ldif
+ if [ "$?" != "0" ]; then
+ return 1
+ fi
}
diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc
index 0b685dbd019..a25313054c0 100755
--- a/testprogs/blackbox/common_test_fns.inc
+++ b/testprogs/blackbox/common_test_fns.inc
@@ -1,7 +1,8 @@
# Common tests
# Pulled out of existing tests to prevent duplication.
#
-test_smbclient() {
+test_smbclient()
+{
name="$1"
cmd="$2"
unc="$3"
@@ -9,7 +10,7 @@ test_smbclient() {
shift
shift
subunit_start_test "$name"
- output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1`
+ output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1)
status=$?
if [ x$status = x0 ]; then
subunit_pass_test "$name"
@@ -19,7 +20,8 @@ test_smbclient() {
return $status
}
-test_smbclient_expect_failure() {
+test_smbclient_expect_failure()
+{
name="$1"
cmd="$2"
unc="$3"
@@ -27,7 +29,7 @@ test_smbclient_expect_failure() {
shift
shift
subunit_start_test "$name"
- output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1`
+ output=$($VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1)
status=$?
if [ x$status = x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name"
@@ -37,7 +39,8 @@ test_smbclient_expect_failure() {
return $status
}
-test_rpcclient_grep() {
+test_rpcclient_grep()
+{
name="$1"
cmd="$2"
srv="$3"
@@ -47,7 +50,7 @@ test_rpcclient_grep() {
shift
shift
subunit_start_test "$name"
- output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1`
+ output=$($VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1)
status=$?
if [ x$status != x0 ]; then
printf '%s' "$output" | subunit_fail_test "$name"
@@ -63,7 +66,8 @@ test_rpcclient_grep() {
return $status
}
-test_rpcclient_expect_failure_grep() {
+test_rpcclient_expect_failure_grep()
+{
name="$1"
cmd="$2"
srv="$3"
@@ -73,7 +77,7 @@ test_rpcclient_expect_failure_grep() {
shift
shift
--
Samba Shared Repository
More information about the samba-cvs
mailing list