diff options
| author | Gerald Carter <jerry@samba.org> | 2005-08-03 06:24:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:23 -0500 |
| commit | b549e4903dd8d3df5197fd1a025ee68b8d6b2da7 (patch) | |
| tree | f8129ffa00357634fd4cfb2358c648dab47541b1 | |
| parent | c731d11471ea9edd762b4cdb67bac06e77cb6f45 (diff) | |
| download | samba-b549e4903dd8d3df5197fd1a025ee68b8d6b2da7.tar.gz samba-b549e4903dd8d3df5197fd1a025ee68b8d6b2da7.tar.bz2 samba-b549e4903dd8d3df5197fd1a025ee68b8d6b2da7.zip | |
r8992: More make test work. Adding a way to order tests (might change
my mind on this later).
(This used to be commit 136fe3f15e74686882f7c1e5a46fcc0bcf7d51a6)
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/script/tests/functions | 4 | ||||
| -rw-r--r-- | source3/script/tests/runtests.sh | 27 | ||||
| -rw-r--r-- | source3/script/tests/t_001.sh (renamed from source3/script/tests/t_listing.sh) | 2 |
4 files changed, 27 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4c5fbb2773..21e1923769 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -776,7 +776,7 @@ pch: ## test: all @echo Running Samba 3 Test suite - sh ./script/tests/runtests.sh t_dir + @sh ./script/tests/runtests.sh t_dir # These dependencies are only approximately correct: we want to make diff --git a/source3/script/tests/functions b/source3/script/tests/functions new file mode 100644 index 0000000000..0969c98724 --- /dev/null +++ b/source3/script/tests/functions @@ -0,0 +1,4 @@ +## +## library file for test functions +## + diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh index 2483de97ca..6ee6d3a32b 100644 --- a/source3/script/tests/runtests.sh +++ b/source3/script/tests/runtests.sh @@ -1,21 +1,28 @@ #!/bin/sh -DOMAIN=SAMBA-TEST -export DOMAIN - if [ "x$1" == "x" ]; then echo "$0 <directory>" exit 1 fi +## +## create the test directory +## PREFIX=`echo $1 | sed s+//+/+` - mkdir -p $PREFIX || exit $? OLD_PWD=`pwd` cd $PREFIX || exit $? export PREFIX_ABS=`pwd` cd $OLD_PWD +## +## setup the various environment variables we need +## + +DOMAIN=SAMBA-TEST + +SRCDIR=`pwd` +SCRIPTDIR=$SRCDIR/script/tests TMPDIR=$PREFIX_ABS/tmp LIBDIR=$PREFIX_ABS/lib PIDDIR=$PREFIX_ABS/pid @@ -31,11 +38,17 @@ PATH=`pwd`/bin:$PATH rm -rf $PREFIX/* mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR -export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR +export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR +export SRCDIR SCRIPTDIR -cd script/tests -for testfile in t_*sh; do +for testfile in `ls $SCRIPTDIR/t_*sh | sort`; do + echo ">>>>>> Starting test driver `basename $testfile` <<<<<" sh $testfile + if [ $? = 0 ]; then + echo ">>>>> test ok <<<<<" + else + echo ">>>>> test failed <<<<<" + fi done diff --git a/source3/script/tests/t_listing.sh b/source3/script/tests/t_001.sh index 0689807671..86837050c7 100644 --- a/source3/script/tests/t_listing.sh +++ b/source3/script/tests/t_001.sh @@ -1,5 +1,7 @@ #!/bin/sh +. $SCRIPTDIR/functions + cat >$CONFFILE<<EOF [global] netbios name = LOCALHOST |