diff options
Diffstat (limited to 'testsuite/build_farm')
| -rw-r--r-- | testsuite/build_farm/basicsmb-domainsec.test | 4 | ||||
| -rw-r--r-- | testsuite/build_farm/basicsmb.fns | 19 | ||||
| -rw-r--r-- | testsuite/build_farm/runlist | 10 | ||||
| -rw-r--r-- | testsuite/build_farm/template/preexec | 1 | ||||
| -rw-r--r-- | testsuite/build_farm/torture-FDPASS.test | 2 | ||||
| -rw-r--r-- | testsuite/build_farm/torture_setup.fns | 2 |
6 files changed, 21 insertions, 17 deletions
diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test index 848cf69a75..eb0a5c81aa 100644 --- a/testsuite/build_farm/basicsmb-domainsec.test +++ b/testsuite/build_farm/basicsmb-domainsec.test @@ -4,8 +4,8 @@ test_joindomain() { test_join_domain_password="$1" - echo "$prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password -d$loglevel" - $prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password -d$loglevel + echo "$prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password" + $prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password status=$? if [ $status = 0 ]; then echo "'net rpc join' correctly joined the domain" diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns index f5143cc4d8..3a9080f473 100644 --- a/testsuite/build_farm/basicsmb.fns +++ b/testsuite/build_farm/basicsmb.fns @@ -63,8 +63,16 @@ test_smb_conf_setup() { template_smb_conf_setup .preexec_close template_smb_conf_setup .preexec_cl_fl + template_smb_conf_setup .share + template_smb_conf_setup .user + template_smb_conf_setup .server + template_smb_conf_setup .domain + template_setup preexec lib/preexec + touch $prefix/lib/smb.conf. + touch $prefix/lib/smb.conf.localhost + echo "127.0.0.1 localhost">$prefix/lib/lmhosts echo "127.0.0.2 BUILDFARM">>$prefix/lib/lmhosts echo "127.0.0.3 SHARE">>$prefix/lib/lmhosts @@ -81,20 +89,13 @@ test_smb_conf_setup() { echo "127.0.0.1" > $prefix/lib/hosts.equiv - cp basicsmb.smb.conf.share $prefix/lib/smb.conf.share - cp basicsmb.smb.conf.user $prefix/lib/smb.conf.user - cp basicsmb.smb.conf.server $prefix/lib/smb.conf.server - cp basicsmb.smb.conf.domain $prefix/lib/smb.conf.domain - - touch $prefix/lib/smb.conf. - touch $prefix/lib/smb.conf.localhost } test_smbpasswd() { test_smbpasswd_password="$1" rm -f $prefix/private/smbpasswd - echo "( echo $test_smbpasswd_password ; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -s -a $whoami" - ( echo $test_smbpasswd_password; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -s -a $whoami + echo "( echo $test_smbpasswd_password ; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -D $loglevel -s -a $whoami" + ( echo $test_smbpasswd_password; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -D $loglevel -s -a $whoami status=$? if [ $status = 0 ]; then echo "smbpasswd correctly set initial password ($test_smbpasswd_password)" diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist index b847e13fbc..5996f24ba8 100644 --- a/testsuite/build_farm/runlist +++ b/testsuite/build_farm/runlist @@ -6,11 +6,13 @@ basicsmb-hostsdeny basicsmb-remote-pass-change \ basicsmb-preexec \ torture-FDPASS torture-LOCK1 torture-LOCK2 \ torture-LOCK3 torture-LOCK4 torture-LOCK5 \ +torture-LOCK6 torture-LOCK7 \ torture-UNLINK torture-BROWSE torture-ATTR \ torture-TRANS2 torture-TORTURE torture-OPLOCK1 \ -torture-OPLOCK3 torture-DIR torture-DENY1 \ -torture-DENY2 torture-TCON torture-RW1 \ -torture-RW2 torture-OPEN torture-RENAME \ -torture-DELETE" +torture-OPLOCK3 torture-DIR torture-DIR1 torture-DENY1 \ +torture-DENY2 torture-TCON torture-TCON2 torture-TCONDEV \ +torture-RW1 torture-RW2 torture-OPEN torture-XCOPY \ +torture-RENAME torture-DELETE torture-PROPERTIES \ +torture-MANGLE torture-FDSESS" #basicsmb-serversec diff --git a/testsuite/build_farm/template/preexec b/testsuite/build_farm/template/preexec index e417d6a017..23809aaf89 100644 --- a/testsuite/build_farm/template/preexec +++ b/testsuite/build_farm/template/preexec @@ -1,2 +1,3 @@ #!/bin/sh + echo "Test worked" > PREFIX/testdir/preexec_touch diff --git a/testsuite/build_farm/torture-FDPASS.test b/testsuite/build_farm/torture-FDPASS.test index e8af277d43..40ffdb666d 100644 --- a/testsuite/build_farm/torture-FDPASS.test +++ b/testsuite/build_farm/torture-FDPASS.test @@ -1,2 +1,2 @@ . torture_setup.fns -test_torture "FDPASS" +test_torture "FDSESS" diff --git a/testsuite/build_farm/torture_setup.fns b/testsuite/build_farm/torture_setup.fns index bf5146148e..a42be94129 100644 --- a/testsuite/build_farm/torture_setup.fns +++ b/testsuite/build_farm/torture_setup.fns @@ -12,7 +12,7 @@ test_torture() { if [ $status = 0 ]; then echo "smbtorture test $torture_test worked" else - echo "smbtorture test $torture_test FAILED!" + echo "smbtorture test $torture_test FAILED (status $status)!" return 1 fi return 0 |