diff options
| author | Brad Henry <brad@samba.org> | 2007-02-21 22:50:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:48:44 -0500 |
| commit | 48b0dabdbaf7538e0896dd137eec5cc97b50a59d (patch) | |
| tree | 773d9d14a806cd27984bed5d05780dc69f05f96f /source4/script/tests/win/wintest_net.sh | |
| parent | f487c24a79223c295afc60e05a0fac9794c3a22d (diff) | |
| download | samba-48b0dabdbaf7538e0896dd137eec5cc97b50a59d.tar.gz samba-48b0dabdbaf7538e0896dd137eec5cc97b50a59d.tar.bz2 samba-48b0dabdbaf7538e0896dd137eec5cc97b50a59d.zip | |
r21494: Fix 'make wintest' to support command-line changes to 'vm-get-ip.pl' and the revertsnapshot() shell function.
Restructure existing tests to work with the recent build farm changes.
Added windows DC testing to 'make wintest'.
Some improvements and generalization to the way errors are handled.
(This used to be commit de9687404e802d7e7629c9d03f496d3c5bd30397)
Diffstat (limited to 'source4/script/tests/win/wintest_net.sh')
| -rwxr-xr-x | source4/script/tests/win/wintest_net.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source4/script/tests/win/wintest_net.sh b/source4/script/tests/win/wintest_net.sh index d2dbb3bcc0..cd1fd2de92 100755 --- a/source4/script/tests/win/wintest_net.sh +++ b/source4/script/tests/win/wintest_net.sh @@ -34,6 +34,14 @@ bind_options="seal,padcheck bigendian" test_type="ncalrpc ncacn_np ncacn_ip_tcp" all_errs=0 + +on_error() { + errstr=$1 + + all_errs=`expr $all_errs + 1` + restore_snapshot $errstr "$VM_CFG_PATH" +} + for o in $bind_options; do for transport in $test_type; do case $transport in @@ -49,12 +57,9 @@ for o in $bind_options; do -U $username%$password \ -W $domain \ $transport:$server[$o] \ - $t || all_errs=`expr $all_errs + 1` - if [ $old_errs -lt $all_errs ]; then - restore_snapshot "\n$test_name failed." - fi + $t || on_error "\n$test_name failed." done done done -testok $0 $all_errs +exit $all_errs |