From a68e8af2d1b92ba9a94fc7cc1eb98cdca687d5fd Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Mon, 11 Mar 2019 16:03:34 +1300 Subject: [PATCH] testsuite: Remove build_farm testsuites This test code is not run (and has not been run for about a decade). Let's remove it - it's there in the git history if we ever want to try to repurpose it again. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Mar 12 02:56:05 UTC 2019 on sn-devel-144 --- source4/selftest/win/README | 49 ----- testsuite/README | 4 +- testsuite/build_farm/backtrace | 15 -- .../build_farm/basicsmb-domainsec-nt4.test | 28 --- testsuite/build_farm/basicsmb-domainsec.test | 27 --- testsuite/build_farm/basicsmb-hostsdeny.test | 18 -- testsuite/build_farm/basicsmb-hostsequiv.test | 26 --- .../build_farm/basicsmb-invalidusers.test | 10 - .../basicsmb-local-pass-change.test | 10 - testsuite/build_farm/basicsmb-preexec.test | 28 --- .../basicsmb-remote-pass-change.test | 10 - testsuite/build_farm/basicsmb-serversec.test | 9 - testsuite/build_farm/basicsmb-shareguest.test | 20 -- testsuite/build_farm/basicsmb-sharelist.test | 22 -- testsuite/build_farm/basicsmb-sharesec.test | 9 - testsuite/build_farm/basicsmb-usersec.test | 9 - testsuite/build_farm/basicsmb.fns | 202 ------------------ testsuite/build_farm/runlist | 18 -- .../build_farm/template/basicsmb.smb.conf | 49 ----- .../template/basicsmb.smb.conf.domain | 2 - .../template/basicsmb.smb.conf.hostsdeny | 1 - .../template/basicsmb.smb.conf.hostsequiv | 3 - .../template/basicsmb.smb.conf.invalidusers | 1 - .../template/basicsmb.smb.conf.preexec | 1 - .../template/basicsmb.smb.conf.preexec_cl_fl | 2 - .../template/basicsmb.smb.conf.preexec_close | 2 - .../template/basicsmb.smb.conf.server | 3 - .../template/basicsmb.smb.conf.share | 1 - .../template/basicsmb.smb.conf.user | 1 - .../template/basicsmb.smb.conf.validusers | 1 - testsuite/build_farm/template/preexec | 3 - testsuite/build_farm/torture-ATTR.test | 2 - testsuite/build_farm/torture-BROWSE.test | 2 - testsuite/build_farm/torture-DELETE.test | 2 - testsuite/build_farm/torture-DENY1.test | 2 - testsuite/build_farm/torture-DENY2.test | 2 - testsuite/build_farm/torture-DIR.test | 2 - testsuite/build_farm/torture-DIR1.test | 2 - testsuite/build_farm/torture-FDPASS.test | 2 - testsuite/build_farm/torture-FDSESS.test | 2 - testsuite/build_farm/torture-LOCK1.test | 2 - testsuite/build_farm/torture-LOCK2.test | 2 - testsuite/build_farm/torture-LOCK3.test | 2 - testsuite/build_farm/torture-LOCK4.test | 2 - testsuite/build_farm/torture-LOCK5.test | 2 - testsuite/build_farm/torture-LOCK6.test | 2 - testsuite/build_farm/torture-LOCK7.test | 2 - testsuite/build_farm/torture-MANGLE.test | 2 - testsuite/build_farm/torture-OPEN.test | 2 - testsuite/build_farm/torture-OPLOCK1.test | 2 - testsuite/build_farm/torture-PROPERTIES.test | 2 - testsuite/build_farm/torture-RANDOMIPC.test | 2 - testsuite/build_farm/torture-RENAME.test | 2 - testsuite/build_farm/torture-RW1.test | 2 - testsuite/build_farm/torture-RW2.test | 2 - testsuite/build_farm/torture-TCON.test | 2 - testsuite/build_farm/torture-TCON1.test | 2 - testsuite/build_farm/torture-TCON2.test | 2 - testsuite/build_farm/torture-TCONDEV.test | 2 - testsuite/build_farm/torture-TORTURE.test | 2 - testsuite/build_farm/torture-TRANS2.test | 2 - testsuite/build_farm/torture-UNLINK.test | 2 - testsuite/build_farm/torture-XCOPY.test | 2 - testsuite/build_farm/torture_setup.fns | 19 -- 64 files changed, 1 insertion(+), 666 deletions(-) delete mode 100755 testsuite/build_farm/backtrace delete mode 100644 testsuite/build_farm/basicsmb-domainsec-nt4.test delete mode 100644 testsuite/build_farm/basicsmb-domainsec.test delete mode 100644 testsuite/build_farm/basicsmb-hostsdeny.test delete mode 100644 testsuite/build_farm/basicsmb-hostsequiv.test delete mode 100644 testsuite/build_farm/basicsmb-invalidusers.test delete mode 100644 testsuite/build_farm/basicsmb-local-pass-change.test delete mode 100644 testsuite/build_farm/basicsmb-preexec.test delete mode 100644 testsuite/build_farm/basicsmb-remote-pass-change.test delete mode 100644 testsuite/build_farm/basicsmb-serversec.test delete mode 100644 testsuite/build_farm/basicsmb-shareguest.test delete mode 100644 testsuite/build_farm/basicsmb-sharelist.test delete mode 100644 testsuite/build_farm/basicsmb-sharesec.test delete mode 100644 testsuite/build_farm/basicsmb-usersec.test delete mode 100644 testsuite/build_farm/basicsmb.fns delete mode 100644 testsuite/build_farm/runlist delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.domain delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.invalidusers delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.preexec delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.preexec_close delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.server delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.share delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.user delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.validusers delete mode 100644 testsuite/build_farm/template/preexec delete mode 100644 testsuite/build_farm/torture-ATTR.test delete mode 100644 testsuite/build_farm/torture-BROWSE.test delete mode 100644 testsuite/build_farm/torture-DELETE.test delete mode 100644 testsuite/build_farm/torture-DENY1.test delete mode 100644 testsuite/build_farm/torture-DENY2.test delete mode 100644 testsuite/build_farm/torture-DIR.test delete mode 100644 testsuite/build_farm/torture-DIR1.test delete mode 100644 testsuite/build_farm/torture-FDPASS.test delete mode 100644 testsuite/build_farm/torture-FDSESS.test delete mode 100644 testsuite/build_farm/torture-LOCK1.test delete mode 100644 testsuite/build_farm/torture-LOCK2.test delete mode 100644 testsuite/build_farm/torture-LOCK3.test delete mode 100644 testsuite/build_farm/torture-LOCK4.test delete mode 100644 testsuite/build_farm/torture-LOCK5.test delete mode 100644 testsuite/build_farm/torture-LOCK6.test delete mode 100644 testsuite/build_farm/torture-LOCK7.test delete mode 100644 testsuite/build_farm/torture-MANGLE.test delete mode 100644 testsuite/build_farm/torture-OPEN.test delete mode 100644 testsuite/build_farm/torture-OPLOCK1.test delete mode 100644 testsuite/build_farm/torture-PROPERTIES.test delete mode 100644 testsuite/build_farm/torture-RANDOMIPC.test delete mode 100644 testsuite/build_farm/torture-RENAME.test delete mode 100644 testsuite/build_farm/torture-RW1.test delete mode 100644 testsuite/build_farm/torture-RW2.test delete mode 100644 testsuite/build_farm/torture-TCON.test delete mode 100644 testsuite/build_farm/torture-TCON1.test delete mode 100644 testsuite/build_farm/torture-TCON2.test delete mode 100644 testsuite/build_farm/torture-TCONDEV.test delete mode 100644 testsuite/build_farm/torture-TORTURE.test delete mode 100644 testsuite/build_farm/torture-TRANS2.test delete mode 100644 testsuite/build_farm/torture-UNLINK.test delete mode 100644 testsuite/build_farm/torture-XCOPY.test delete mode 100644 testsuite/build_farm/torture_setup.fns diff --git a/source4/selftest/win/README b/source4/selftest/win/README index fc934385c4d..f6e716c8da0 100644 --- a/source4/selftest/win/README +++ b/source4/selftest/win/README @@ -70,52 +70,3 @@ remotely administered with telnet. Specifically, this will allow us to use 'make wintest' in Samba 4 to perform smbtorture tests against a Windows host, and perform tests from a Windows client to a Samba server. -INTEGRATING WITH THE BUILD FARM - -Follow the standard steps to add a host to the build farm. The major -difference is that we will need to run these tests as root. To run the -Windows tests in the build farm, a .fns file will need to be created for -your new host that exports a WINTESTCONF environment variable pointing to a -config file used by 'make wintest'. An example of this config file can be -found at source/selftest/win/test_win.conf in the Samba 4 source tree. - -I've also included the bnhtest.fns file that I'm using for my build farm host -below, as an example. It was modified from generic.fns. - -action_test_windows() { - do_make wintest - w_status=$? - echo "WINTEST STATUS: $w_status" - return $w_status; -} - -per_run_hook - -system=`uname` - -export WINTESTCONF="/home/build/win/test_win.conf" - -for compiler in gcc cc icc; do - - # arrgh, "which" gives no err code on solaris - path=`which $compiler` - if [ -x "$path" ]; then - - if $compiler -v 2>&1 | grep gcc.version > /dev/null; then - isgcc=1 - CFLAGS="-Wall" - export CFLAGS - else - CFLAGS="" - export CFLAGS - isgcc=0 - fi - if [ $compiler = gcc -o $isgcc = 0 ]; then - - # only attempt samba4 if we have perl - if which perl > /dev/null; then - test_tree samba4 source $compiler configure build install test_windows test - fi - fi - fi -done diff --git a/testsuite/README b/testsuite/README index 5ca207f62ae..e04a7836d38 100644 --- a/testsuite/README +++ b/testsuite/README @@ -7,9 +7,7 @@ The Samba testsuite is divided up into the following subdirectories. - nsswitch Tests for nsswitch extensions - - build_farm Tests designed to run automatically on the build farm - -All the scripts except those in build_farm require an unreleased +All the scripts require an unreleased version of DejaGNU, and although they contain some useful tests they are not so useful at the moment. All scripts are migrating to a single test framework, Satyr. diff --git a/testsuite/build_farm/backtrace b/testsuite/build_farm/backtrace deleted file mode 100755 index efaa9f2dcde..00000000000 --- a/testsuite/build_farm/backtrace +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Modified version of tridge's backtrace script. -# we want everything on stderr, so the program is not disturbed -exec 1>&2 - -PID=$1 -TMPFILE=$prefix/backtrace.$$ -cat << EOF > $TMPFILE -set height 0 -up 8 -bt full -quit -EOF -gdb -x $TMPFILE $prefix/sbin/smbd $PID -/bin/rm -f $TMPFILE diff --git a/testsuite/build_farm/basicsmb-domainsec-nt4.test b/testsuite/build_farm/basicsmb-domainsec-nt4.test deleted file mode 100644 index 4e68acabec5..00000000000 --- a/testsuite/build_farm/basicsmb-domainsec-nt4.test +++ /dev/null @@ -1,28 +0,0 @@ -. basicsmb.fns - -test_joindomain_nt4() { - - echo $prefix/bin/smbpasswd -L -a -m buildfarm$ - $prefix/bin/smbpasswd -L -a -m buildfarm$ - - echo $prefix/bin/net rpc oldjoin -S localhost - $prefix/bin/net rpc oldjoin -S localhost - status=$? - if [ $status = 0 ]; then - echo "'net rpc oldjoin' correctly joined the domain" - else - echo "'net rpc oldjoin' failed to join the domain! (status $status)" - return 1 - fi - return 0 -} - -password=samba -security=DOMAIN -(test_smb_conf_setup && test_smbpasswd $password ) || exit 1 - -test_joindomain_nt4 $password || exit 1 - -test_listfilesauth $security || exit 1 -test_listfilesnpw $security || exit 1 - diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test deleted file mode 100644 index eb0a5c81aa1..00000000000 --- a/testsuite/build_farm/basicsmb-domainsec.test +++ /dev/null @@ -1,27 +0,0 @@ - -. basicsmb.fns - -test_joindomain() { - test_join_domain_password="$1" - - 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" - else - echo "'net rpc join' failed to join the domain! (status $status)" - return 1 - fi - return 0 -} - -password=samba -(test_smb_conf_setup && test_smbpasswd $password ) || exit 1 - -test_joindomain $password || exit 1 - -security=DOMAIN -test_listfilesauth $security || exit 1 -test_listfilesnpw $security || exit 1 - diff --git a/testsuite/build_farm/basicsmb-hostsdeny.test b/testsuite/build_farm/basicsmb-hostsdeny.test deleted file mode 100644 index c7f6bec62f7..00000000000 --- a/testsuite/build_farm/basicsmb-hostsdeny.test +++ /dev/null @@ -1,18 +0,0 @@ -. basicsmb.fns - -password="samba" -security="hostsdeny" -(test_smb_conf_setup && test_smbpasswd $password) || exit 1 - -(test_listfilesauth_should_deny $security) || exit 1 - - - - - - - - - - - diff --git a/testsuite/build_farm/basicsmb-hostsequiv.test b/testsuite/build_farm/basicsmb-hostsequiv.test deleted file mode 100644 index d424743d116..00000000000 --- a/testsuite/build_farm/basicsmb-hostsequiv.test +++ /dev/null @@ -1,26 +0,0 @@ -if [ $whoami = "root" ]; then - exit 0; -fi - -. basicsmb.fns - -test_listfilesrootnpw() { - remote_name="$1" - echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -Uroot% -c 'ls' - $prefix/bin/smbclient //$remote_name/samba -n buildclient -Uroot% -c 'ls' - status=$? - if [ $status = 0 ]; then - echo "smbd listed files AS ROOT with NO PASSWORD (hosts equiv test)!" - return 1 - else - echo "listing files with smbd failed with status $status (correct)" - fi - return 0 -} - -password="not-a-valid-password" -security="hostsequiv" -(test_smb_conf_setup ) || exit 1 - -(test_listfilesauth $security) || exit 1 -(test_listfilesrootnpw $security) || exit 1 diff --git a/testsuite/build_farm/basicsmb-invalidusers.test b/testsuite/build_farm/basicsmb-invalidusers.test deleted file mode 100644 index 7d67cc2fc71..00000000000 --- a/testsuite/build_farm/basicsmb-invalidusers.test +++ /dev/null @@ -1,10 +0,0 @@ -. basicsmb.fns - -password="samba" -security="invalidusers" -(test_smb_conf_setup && test_smbpasswd $password) || exit 1 - -(test_listfilesauth_should_deny $security) || exit 1 - -security="validusers" -(test_listfilesauth $security) || exit 1 diff --git a/testsuite/build_farm/basicsmb-local-pass-change.test b/testsuite/build_farm/basicsmb-local-pass-change.test deleted file mode 100644 index 432376c6662..00000000000 --- a/testsuite/build_farm/basicsmb-local-pass-change.test +++ /dev/null @@ -1,10 +0,0 @@ -. basicsmb.fns - -passwordold=samba -password=samba2 -security=USER -(test_smb_conf_setup && test_smbpasswd $passwordold && test_smbpasswd_local $passwordold $password) || exit 1 - -test_listfilesauth $security || exit 1 -test_listfilesnpw $security || exit 1 - diff --git a/testsuite/build_farm/basicsmb-preexec.test b/testsuite/build_farm/basicsmb-preexec.test deleted file mode 100644 index fc072e5fdb6..00000000000 --- a/testsuite/build_farm/basicsmb-preexec.test +++ /dev/null @@ -1,28 +0,0 @@ -. basicsmb.fns - -password=samba -(test_smb_conf_setup && test_smbpasswd $password ) || exit 1 - -rm -f $prefix/testdir/preexec_touch - -mode=PREEXEC -(test_listfilesauth $mode) || exit 1 - -if [ -f $prefix/testdir/preexec_touch ]; then - rm -f $prefix/testdir/preexec_touch -else - exit 1; -fi - -mode=PREEXEC_close -(test_listfilesauth $mode) || exit 1 - -if [ -f $prefix/testdir/preexec_touch ]; then - rm -f $prefix/testdir/preexec_touch -else - exit 1; -fi - -mode=PREEXEC_cl_fl -(test_listfilesauth_should_deny $mode) || exit 1 - diff --git a/testsuite/build_farm/basicsmb-remote-pass-change.test b/testsuite/build_farm/basicsmb-remote-pass-change.test deleted file mode 100644 index adfe0dc3ebc..00000000000 --- a/testsuite/build_farm/basicsmb-remote-pass-change.test +++ /dev/null @@ -1,10 +0,0 @@ -. basicsmb.fns - -passwordold=samba -password=samba2 -security=USER -(test_smb_conf_setup && test_smbpasswd $passwordold && test_smbpasswd_remote $passwordold $password) || exit 1 - -test_listfilesauth $security || exit 1 -test_listfilesnpw $security || exit 1 - diff --git a/testsuite/build_farm/basicsmb-serversec.test b/testsuite/build_farm/basicsmb-serversec.test deleted file mode 100644 index b45899ab774..00000000000 --- a/testsuite/build_farm/basicsmb-serversec.test +++ /dev/null @@ -1,9 +0,0 @@ -. basicsmb.fns - -password=samba -security=SERVER -(test_smb_conf_setup && test_smbpasswd $password ) || exit 1 - -test_listfilesauth $security || exit 1 -test_listfilesnpw $security || exit 1 - diff --git a/testsuite/build_farm/basicsmb-shareguest.test b/testsuite/build_farm/basicsmb-shareguest.test deleted file mode 100644 index 4ba445a17e3..00000000000 --- a/testsuite/build_farm/basicsmb-shareguest.test +++ /dev/null @@ -1,20 +0,0 @@ -. basicsmb.fns - -test_listfilesguestshare() { - remote_name=$1 - echo $prefix/bin/smbclient //$remote_name/guest_share -n buildclient -U$whoami% -c 'ls' - $prefix/bin/smbclient //$remote_name/guest_share -n buildclient -U$whoami% -c 'ls' - status=$? - if [ $status = 0 ]; then - echo "smbd listed files correctly (guest share)" - else - echo "listing files on a guest share failed with status $status" - return 1 - fi - return 0 -} - -security=SHARE -( test_smb_conf_setup ) || exit 1 - -( test_listfilesguestshare $security ) || exit 1 \ No newline at end of file diff --git a/testsuite/build_farm/basicsmb-sharelist.test b/testsuite/build_farm/basicsmb-sharelist.test deleted file mode 100644 index 188e985658d..00000000000 --- a/testsuite/build_farm/basicsmb-sharelist.test +++ /dev/null @@ -1,22 +0,0 @@ -. basicsmb.fns -test_sharelist() { - echo $prefix/bin/smbclient -U$whoami% -L localhost - $prefix/bin/smbclient -U$whoami% -L localhost - status=$? - if [ $status = 0 ]; then - echo "smbd listed shares OK" - else - echo "listing shares with smbd failed with status $status" - return 1 - fi - return 0 -} - -# Need guest account -password=samba -security=USER -(test_smb_conf_setup && test_smbpasswd $password ) || exit 1 - -test_sharelist || exit 1 - - diff --git a/testsuite/build_farm/basicsmb-sharesec.test b/testsuite/build_farm/basicsmb-sharesec.test deleted file mode 100644 index edef6a91230..00000000000 --- a/testsuite/build_farm/basicsmb-sharesec.test +++ /dev/null @@ -1,9 +0,0 @@ -. basicsmb.fns - -password="samba" -security="SHARE" -(test_smb_conf_setup && ( test_smbpasswd $password ) ) || exit 1 - -(test_listfilesauth $security) || exit 1 -(test_listfilesnpw $security) || exit 1 - diff --git a/testsuite/build_farm/basicsmb-usersec.test b/testsuite/build_farm/basicsmb-usersec.test deleted file mode 100644 index 06f2a1c4040..00000000000 --- a/testsuite/build_farm/basicsmb-usersec.test +++ /dev/null @@ -1,9 +0,0 @@ -. basicsmb.fns - -password=samba -security=USER -(test_smb_conf_setup && test_smbpasswd $password ) || exit 1 - -test_listfilesauth $security || exit 1 -test_listfilesnpw $security || exit 1 - diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns deleted file mode 100644 index d1127e872dd..00000000000 --- a/testsuite/build_farm/basicsmb.fns +++ /dev/null @@ -1,202 +0,0 @@ -#! /bin/sh - -# Common functions for Samba build scripts. - -# Copyright (C) 2001 by Martin Pool and others - -# The following variables are passed in by the calling script. They -# originate in either the buildfarm scripts or the configured -# Makefile. - -# PREFIX = Installed prefix of samba test installation. Used to -# locate binaries, configuration files, etc. - -# XXX: It's pretty bad to clobber the installed configuration file and -# other data in $prefix, because somebody might unwittingly run this -# with prefix=/usr. - -# Really what we want is a consistent way to pass the location of the -# configuration and all other files into *all* Samba programs -# (smbclient, smd, ...) and be able to set them to a temporary -# directory when testing. Some of them take a -c parameter, but tpot -# says it's not done consistently. - -template_setup() { - cat template/$1 | \ - sed "s|PREFIX|$prefix|g" | \ - sed "s|BUILD_FARM|$test_root|g" | \ - sed "s|WHOAMI|$whoami|g" | \ - sed "s|LOGLEVEL|$loglevel|g" \ - > $prefix/$2 - echo "template_setup: Created $prefix/$2" -} - -template_smb_conf_setup() { - template_setup "basicsmb.smb.conf$1" "lib/smb.conf$1" -} - -test_smb_conf_setup() { - echo "test_smb_conf_setup: Configuring: " - echo " PREFIX=$prefix" - echo " BUILD_FARM=$test_root" - echo " WHOAMI=$whoami" - echo " LOGLEVEL=$loglevel" - echo " TREE=$tree" - - case "$prefix" in - /usr*|/|//) - echo "** I don't want to clobber your installation in " - echo "** $prefix" - echo "** by running tests there. Please reconfigure this source tree to" - echo "** use a different prefix." - exit 1 - esac - -# Please keep these names under 15 characters, -# so that the final name is 31 characters or fewer. - - template_smb_conf_setup - template_smb_conf_setup .hostsequiv - template_smb_conf_setup .validusers - template_smb_conf_setup .invalidusers - template_smb_conf_setup .preexec - 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 - echo "127.0.0.4 USER">>$prefix/lib/lmhosts - echo "127.0.0.5 SERVER">>$prefix/lib/lmhosts - echo "127.0.0.6 DOMAIN">>$prefix/lib/lmhosts - echo "127.0.0.7 HOSTSEQUIV">>$prefix/lib/lmhosts - echo "127.0.0.7 VALIDUSERS">>$prefix/lib/lmhosts - echo "127.0.0.7 INVALIDUSERS">>$prefix/lib/lmhosts - echo "127.0.0.7 PREEXEC">>$prefix/lib/lmhosts - echo "127.0.0.7 PREEXEC_CLOSE">>$prefix/lib/lmhosts - echo "127.0.0.7 PREEXEC_CL_FL">>$prefix/lib/lmhosts - - - echo "127.0.0.1" > $prefix/lib/hosts.equiv - -} - -test_smbpasswd() { - test_smbpasswd_password="$1" - rm -f $prefix/private/smbpasswd - 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)" - else - echo "smbpasswd failed to set initial password ($test_smbpasswd_password)! (status $status)" - return 1 - fi - return 0 -} - -test_smbpasswd_remote() { - test_smbpasswd_rem_password="$1" - test_smbpasswd_rem_newpassword="$2" - echo "( echo $test_smbpasswd_rem_password; echo $test_smbpasswd_rem_newpassword; echo $test_smbpasswd_rem_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami" - ( echo $test_smbpasswd_rem_password; echo $test_smbpasswd_rem_newpassword; echo $test_smbpasswd_rem_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami - status=$? - if [ $status = 0 ]; then - echo "smbpasswd correctly remotely changed password ($test_smbpasswd_rem_password -> $test_smbpasswd_rem_newpassword)" - else - echo "smbpasswd failed to remotely changed password ($test_smbpasswd_rem_password -> $test_smbpasswd_rem_newpassword)! (status $status)" - return 1 - fi - return 0 -} - -test_smbpasswd_local() { - test_smbpasswd_newpassword="$2" - echo "( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L -s $whoami" - ( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L -s $whoami - status=$? - if [ $status = 0 ]; then - echo "smbpasswd correctly locally changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)" - else - echo "smbpasswd failed to locallly changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)! (status $status)" - return 1 - fi - return 0 -} - -test_listfilesauth() { - remote_name="$1" - echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls' - $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls' - status=$? - if [ $status = 0 ]; then - echo "listed files OK" - else - echo "listing files with smbd failed with status $status" - return 1 - fi - return 0 -} - -test_listfilesnpw() { - remote_name="$1" - echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami% -c 'ls' - $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami% -c 'ls' - status=$? - if [ $status = 0 ]; then - echo "smbd listed files with NO PASSWORD on an authenticated share!" - return 1 - else - echo "listing files with smbd failed with status $status (correct)" - fi - return 0 -} - -test_listfilesauth_should_deny() { - remote_name="$1" - echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls' - $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls' - status=$? - if [ $status = 0 ]; then - echo "smbd LISTED FILES despite smb.conf entires to the contary!" - return 1 - else - echo "listing files with smbd failed with status $status (correct)" - fi - return 0 -} - - - -# Give sensible defaults to some variables. - -# "What's my age again?" - -if [ ! $USER = "" ]; then - whoami=$USER -else - if [ ! $LOGNAME = "" ]; then - whoami=$LOGNAME - else - whoami=build - fi -fi - - - -if test -z "$loglevel" -then - loglevel=1 -fi - diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist deleted file mode 100644 index f9456b74ec4..00000000000 --- a/testsuite/build_farm/runlist +++ /dev/null @@ -1,18 +0,0 @@ -TEST_ALL="basicsmb-sharelist basicsmb-local-pass-change \ -basicsmb-sharesec basicsmb-usersec \ -basicsmb-serversec \ -basicsmb-shareguest basicsmb-hostsequiv basicsmb-invalidusers \ -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-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-domainsec basicsmb-domainsec-nt4 \ No newline at end of file diff --git a/testsuite/build_farm/template/basicsmb.smb.conf b/testsuite/build_farm/template/basicsmb.smb.conf deleted file mode 100644 index 6cad714aee4..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf +++ /dev/null @@ -1,49 +0,0 @@ -[global] - netbios name = BUILDFARM - workgroup = TESTWG - log level = LOGLEVEL - debug timestamp = no - encrypt passwords = yes - server string = Samba %v Build Farm Tests - name resolve order = lmhosts - guest account = WHOAMI - domain logons = yes - - strict locking = yes - - include = PREFIX/lib/smb.conf.%L - - add machine script = useradd %u -d /dev/null -s /bin/false - - panic action = /bin/sh BUILD_FARM/samba/testsuite/build_farm/backtrace %d - - passdb backend = smbpasswd - - idmap uid = 10000-200000 - map hidden = yes - create mask = 0777 - -[test] - path = PREFIX/testdir - read only = no - -[samba] - path = BUILD_FARM/samba_3_0 - read only = yes - comment = Samba HEAD Sources - -[samba_2_2] - path = BUILD_FARM/samba_2_2 - read only = yes - comment = Samba 2.2. Sources - -[rsync] - path = BUILD_FARM/rsync - read only = yes - comment = Rsync Sources - -[guest_share] - path = PREFIX - guest ok = yes - read only = yes - comment = Unauthenticated share for use in share level test diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.domain b/testsuite/build_farm/template/basicsmb.smb.conf.domain deleted file mode 100644 index 8b9728838e1..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.domain +++ /dev/null @@ -1,2 +0,0 @@ -security=domain -password server=user diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny b/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny deleted file mode 100644 index 3fce0bdbf4e..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny +++ /dev/null @@ -1 +0,0 @@ - hosts deny = 127. \ No newline at end of file diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv b/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv deleted file mode 100644 index 750af74f59c..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv +++ /dev/null @@ -1,3 +0,0 @@ - hostname lookups = no - hosts equiv=PREFIX/lib/hosts.equiv - auth methods = hostsequiv diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers b/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers deleted file mode 100644 index a96a316db9f..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers +++ /dev/null @@ -1 +0,0 @@ - invalid users = WHOAMI diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.preexec b/testsuite/build_farm/template/basicsmb.smb.conf.preexec deleted file mode 100644 index cc34872c5df..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.preexec +++ /dev/null @@ -1 +0,0 @@ -preexec = /bin/sh PREFIX/lib/preexec diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl b/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl deleted file mode 100644 index 4a6fae57bc0..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl +++ /dev/null @@ -1,2 +0,0 @@ -preexec close = yes -preexec = PREFIX/lib/preexec_does_not_exist diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close b/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close deleted file mode 100644 index 3aac6998bfc..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close +++ /dev/null @@ -1,2 +0,0 @@ -preexec close = yes -preexec = /bin/sh PREFIX/lib/preexec diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.server b/testsuite/build_farm/template/basicsmb.smb.conf.server deleted file mode 100644 index 016f84cd353..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.server +++ /dev/null @@ -1,3 +0,0 @@ -security=server -password server=user -smb passwd file=NON_EXISTANT_FILE diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.share b/testsuite/build_farm/template/basicsmb.smb.conf.share deleted file mode 100644 index 8e69cc199a5..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.share +++ /dev/null @@ -1 +0,0 @@ - security = share diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.user b/testsuite/build_farm/template/basicsmb.smb.conf.user deleted file mode 100644 index 9d294b9c396..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.user +++ /dev/null @@ -1 +0,0 @@ - security = user diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.validusers b/testsuite/build_farm/template/basicsmb.smb.conf.validusers deleted file mode 100644 index d4a85e0a028..00000000000 --- a/testsuite/build_farm/template/basicsmb.smb.conf.validusers +++ /dev/null @@ -1 +0,0 @@ - valid users = WHOAMI diff --git a/testsuite/build_farm/template/preexec b/testsuite/build_farm/template/preexec deleted file mode 100644 index 23809aaf893..00000000000 --- a/testsuite/build_farm/template/preexec +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "Test worked" > PREFIX/testdir/preexec_touch diff --git a/testsuite/build_farm/torture-ATTR.test b/testsuite/build_farm/torture-ATTR.test deleted file mode 100644 index db6d5e87824..00000000000 --- a/testsuite/build_farm/torture-ATTR.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "ATTR" diff --git a/testsuite/build_farm/torture-BROWSE.test b/testsuite/build_farm/torture-BROWSE.test deleted file mode 100644 index da758977da5..00000000000 --- a/testsuite/build_farm/torture-BROWSE.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "BROWSE" diff --git a/testsuite/build_farm/torture-DELETE.test b/testsuite/build_farm/torture-DELETE.test deleted file mode 100644 index 395f449d1e1..00000000000 --- a/testsuite/build_farm/torture-DELETE.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "DELETE" diff --git a/testsuite/build_farm/torture-DENY1.test b/testsuite/build_farm/torture-DENY1.test deleted file mode 100644 index 99ce7ea8869..00000000000 --- a/testsuite/build_farm/torture-DENY1.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "DENY1" diff --git a/testsuite/build_farm/torture-DENY2.test b/testsuite/build_farm/torture-DENY2.test deleted file mode 100644 index 17c8f707d87..00000000000 --- a/testsuite/build_farm/torture-DENY2.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "DENY2" diff --git a/testsuite/build_farm/torture-DIR.test b/testsuite/build_farm/torture-DIR.test deleted file mode 100644 index 085ce59c3b0..00000000000 --- a/testsuite/build_farm/torture-DIR.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "DIR" diff --git a/testsuite/build_farm/torture-DIR1.test b/testsuite/build_farm/torture-DIR1.test deleted file mode 100644 index 6cc075e9ba9..00000000000 --- a/testsuite/build_farm/torture-DIR1.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "DIR1" diff --git a/testsuite/build_farm/torture-FDPASS.test b/testsuite/build_farm/torture-FDPASS.test deleted file mode 100644 index 40ffdb666d7..00000000000 --- a/testsuite/build_farm/torture-FDPASS.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "FDSESS" diff --git a/testsuite/build_farm/torture-FDSESS.test b/testsuite/build_farm/torture-FDSESS.test deleted file mode 100644 index e8af277d430..00000000000 --- a/testsuite/build_farm/torture-FDSESS.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "FDPASS" diff --git a/testsuite/build_farm/torture-LOCK1.test b/testsuite/build_farm/torture-LOCK1.test deleted file mode 100644 index fd01c492f16..00000000000 --- a/testsuite/build_farm/torture-LOCK1.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK1" diff --git a/testsuite/build_farm/torture-LOCK2.test b/testsuite/build_farm/torture-LOCK2.test deleted file mode 100644 index 66b671d8010..00000000000 --- a/testsuite/build_farm/torture-LOCK2.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK2" diff --git a/testsuite/build_farm/torture-LOCK3.test b/testsuite/build_farm/torture-LOCK3.test deleted file mode 100644 index dcf14019d8e..00000000000 --- a/testsuite/build_farm/torture-LOCK3.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK3" diff --git a/testsuite/build_farm/torture-LOCK4.test b/testsuite/build_farm/torture-LOCK4.test deleted file mode 100644 index 8fdc9b66615..00000000000 --- a/testsuite/build_farm/torture-LOCK4.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK4" diff --git a/testsuite/build_farm/torture-LOCK5.test b/testsuite/build_farm/torture-LOCK5.test deleted file mode 100644 index a04f83c8491..00000000000 --- a/testsuite/build_farm/torture-LOCK5.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK5" diff --git a/testsuite/build_farm/torture-LOCK6.test b/testsuite/build_farm/torture-LOCK6.test deleted file mode 100644 index 78e139e3103..00000000000 --- a/testsuite/build_farm/torture-LOCK6.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK6" diff --git a/testsuite/build_farm/torture-LOCK7.test b/testsuite/build_farm/torture-LOCK7.test deleted file mode 100644 index fc967fca57d..00000000000 --- a/testsuite/build_farm/torture-LOCK7.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "LOCK7" diff --git a/testsuite/build_farm/torture-MANGLE.test b/testsuite/build_farm/torture-MANGLE.test deleted file mode 100644 index 5a3d478a456..00000000000 --- a/testsuite/build_farm/torture-MANGLE.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "MANGLE" diff --git a/testsuite/build_farm/torture-OPEN.test b/testsuite/build_farm/torture-OPEN.test deleted file mode 100644 index ee3e55f0890..00000000000 --- a/testsuite/build_farm/torture-OPEN.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "OPEN" diff --git a/testsuite/build_farm/torture-OPLOCK1.test b/testsuite/build_farm/torture-OPLOCK1.test deleted file mode 100644 index bb606ad3bc9..00000000000 --- a/testsuite/build_farm/torture-OPLOCK1.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "OPLOCK1" diff --git a/testsuite/build_farm/torture-PROPERTIES.test b/testsuite/build_farm/torture-PROPERTIES.test deleted file mode 100644 index 91fde27f8af..00000000000 --- a/testsuite/build_farm/torture-PROPERTIES.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "PROPERTIES" diff --git a/testsuite/build_farm/torture-RANDOMIPC.test b/testsuite/build_farm/torture-RANDOMIPC.test deleted file mode 100644 index e510b6b6672..00000000000 --- a/testsuite/build_farm/torture-RANDOMIPC.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "RANDOMIPC" diff --git a/testsuite/build_farm/torture-RENAME.test b/testsuite/build_farm/torture-RENAME.test deleted file mode 100644 index 58cb8eb466f..00000000000 --- a/testsuite/build_farm/torture-RENAME.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "RENAME" diff --git a/testsuite/build_farm/torture-RW1.test b/testsuite/build_farm/torture-RW1.test deleted file mode 100644 index 6be4a897d91..00000000000 --- a/testsuite/build_farm/torture-RW1.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "RW1" diff --git a/testsuite/build_farm/torture-RW2.test b/testsuite/build_farm/torture-RW2.test deleted file mode 100644 index dc457decab1..00000000000 --- a/testsuite/build_farm/torture-RW2.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "RW2" diff --git a/testsuite/build_farm/torture-TCON.test b/testsuite/build_farm/torture-TCON.test deleted file mode 100644 index 7d1aba0f29f..00000000000 --- a/testsuite/build_farm/torture-TCON.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "TCON" diff --git a/testsuite/build_farm/torture-TCON1.test b/testsuite/build_farm/torture-TCON1.test deleted file mode 100644 index 3c9267640de..00000000000 --- a/testsuite/build_farm/torture-TCON1.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "TCON1" diff --git a/testsuite/build_farm/torture-TCON2.test b/testsuite/build_farm/torture-TCON2.test deleted file mode 100644 index 1f30a975daa..00000000000 --- a/testsuite/build_farm/torture-TCON2.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "TCON2" diff --git a/testsuite/build_farm/torture-TCONDEV.test b/testsuite/build_farm/torture-TCONDEV.test deleted file mode 100644 index 18bd5345fb7..00000000000 --- a/testsuite/build_farm/torture-TCONDEV.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "TCONDEV" diff --git a/testsuite/build_farm/torture-TORTURE.test b/testsuite/build_farm/torture-TORTURE.test deleted file mode 100644 index bc97e94e850..00000000000 --- a/testsuite/build_farm/torture-TORTURE.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "TORTURE" diff --git a/testsuite/build_farm/torture-TRANS2.test b/testsuite/build_farm/torture-TRANS2.test deleted file mode 100644 index d2a387f1afc..00000000000 --- a/testsuite/build_farm/torture-TRANS2.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "TRANS2" diff --git a/testsuite/build_farm/torture-UNLINK.test b/testsuite/build_farm/torture-UNLINK.test deleted file mode 100644 index b7086bbc838..00000000000 --- a/testsuite/build_farm/torture-UNLINK.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "UNLINK" diff --git a/testsuite/build_farm/torture-XCOPY.test b/testsuite/build_farm/torture-XCOPY.test deleted file mode 100644 index 94cc7979769..00000000000 --- a/testsuite/build_farm/torture-XCOPY.test +++ /dev/null @@ -1,2 +0,0 @@ -. torture_setup.fns -test_torture "XCOPY" diff --git a/testsuite/build_farm/torture_setup.fns b/testsuite/build_farm/torture_setup.fns deleted file mode 100644 index a42be94129b..00000000000 --- a/testsuite/build_farm/torture_setup.fns +++ /dev/null @@ -1,19 +0,0 @@ -. basicsmb.fns - -test_torture() { - torture_test=$1 - password=samba - security=USER - (test_smb_conf_setup && test_smbpasswd $password ) || return 1 - - echo $srcdir/bin/smbtorture //localhost/test -U$whoami%$password $torture_test - $srcdir/bin/smbtorture //localhost/test -U$whoami%$password $torture_test - status=$? - if [ $status = 0 ]; then - echo "smbtorture test $torture_test worked" - else - echo "smbtorture test $torture_test FAILED (status $status)!" - return 1 - fi - return 0 -} -- 2.34.1