diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 11:30:34 -0700 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 17:48:23 -0700 |
commit | 31d5ac05402ed9ac8158d143283c7f8b2d7bb7b4 (patch) | |
tree | 072359171a72ba718c0298232e83e45157b25809 /source4 | |
parent | 54f0da368f35ce7d7fd4b093b865ffea284d826b (diff) | |
download | samba-31d5ac05402ed9ac8158d143283c7f8b2d7bb7b4.tar.gz samba-31d5ac05402ed9ac8158d143283c7f8b2d7bb7b4.tar.bz2 samba-31d5ac05402ed9ac8158d143283c7f8b2d7bb7b4.zip |
selftest: Let tests add prefix to tests by themselve.
Diffstat (limited to 'source4')
-rwxr-xr-x | source4/selftest/tests.sh | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh index b3bb85dd34..e1b176a17a 100755 --- a/source4/selftest/tests.sh +++ b/source4/selftest/tests.sh @@ -35,12 +35,13 @@ plantestsuite() { cmdline="$*" echo "-- TEST --" if [ "$env" = "none" ]; then - echo "samba4.$name" + fullname="samba4.$name" else - echo "samba4.$name ($env)" + fullname="samba4.$name ($env)" fi + echo $fullname echo $env - echo $cmdline + echo $cmdline "2>&1" "| ../selftest/filter-subunit --prefix \"$fullname.\"" } plantestsuite_loadlist() { @@ -50,12 +51,13 @@ plantestsuite_loadlist() { cmdline="$*" echo "-- TEST-LOADLIST --" if [ "$env" = "none" ]; then - echo "samba4.$name" + fullname="samba4.$name" else - echo "samba4.$name ($env)" + fullname="samba4.$name ($env)" fi + echo $fullname echo $env - echo $cmdline + echo $cmdline "2>&1" "| ../selftest/filter-subunit --prefix \"$fullname.\"" } plantestsuite_idlist() { @@ -65,12 +67,13 @@ plantestsuite_idlist() { cmdline="$*" echo "-- TEST-IDLIST --" if [ "$env" = "none" ]; then - echo "samba4.$name" + fullname="samba4.$name" else - echo "samba4.$name ($env)" + fullname="samba4.$name ($env)" fi + echo $fullname echo $env - echo $cmdline + echo $cmdline "2>&1" "| ../selftest/filter-subunit --prefix \"$fullname.\"" } skiptestsuite() { @@ -296,7 +299,7 @@ for env in dc fl2000dc fl2003dc fl2008r2dc; do plantestsuite_loadlist "rpc.lsa.secrets on $transport with Kerberos - use Samba3 style login, use target principal" $env $smb4torture $transport:"\$SERVER" -k yes -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=\$NETBIOSNAME" "RPC-LSA-SECRETS-none*" "$*" plansmbtorturetestsuite NET-API-BECOME-DC $env "\$SERVER[$VALIDATE]" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" "$*" plantestsuite_loadlist "rpc.echo on $transport with $bindoptions and $echooptions" $env $smb4torture $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" RPC-ECHO "$*" - + # Echo tests test bulk Kerberos encryption of DCE/RPC for bindoptions in connect spnego spnego,sign spnego,seal $VALIDATE padcheck bigendian bigendian,seal; do echooptions="--option=socket:testnonblock=True --option=torture:quick=yes -k yes" |