From c731d11471ea9edd762b4cdb67bac06e77cb6f45 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 3 Aug 2005 05:46:43 +0000 Subject: [PATCH] r8990: First trivial example of 'make test' (This used to be commit 11c886394970713a226d1fe46a4931ef97bb39a8) --- source3/Makefile.in | 22 +++++++++++----- source3/script/tests/gdb_backtrace | 41 ++++++++++++++++++++++++++++++ source3/script/tests/runtests.sh | 41 ++++++++++++++++++++++++++++++ source3/script/tests/t_listing.sh | 28 ++++++++++++++++++++ 4 files changed, 125 insertions(+), 7 deletions(-) create mode 100644 source3/script/tests/gdb_backtrace create mode 100644 source3/script/tests/runtests.sh create mode 100644 source3/script/tests/t_listing.sh diff --git a/source3/Makefile.in b/source3/Makefile.in index 423c69089b1..4c5fbb27739 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -771,6 +771,14 @@ pch: rm -f $(srcdir)/include/includes.h.gch $(CC) -I. -I$(srcdir) $(FLAGS) -c $(srcdir)/include/includes.h -o $(srcdir)/include/includes.h.gch +## +## Targets for 'make test' +## +test: all + @echo Running Samba 3 Test suite + sh ./script/tests/runtests.sh t_dir + + # These dependencies are only approximately correct: we want to make # sure Samba's paths are updated if ./configure is re-run. Really it # would be nice if "make prefix=/opt/samba all" also rebuilt things, @@ -1433,7 +1441,7 @@ TOPFILES=dynconfig.o dynconfig.@PICSUFFIX@ clean: delheaders python_clean -rm -f core */*~ *~ */*.o */*.@PICSUFFIX@ */*.@SHLIBEXT@ \ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) \ - $(LIBSMBCLIENT) $(EVERYTHING_PROGS) .headers.stamp + $(LIBSMBCLIENT) $(EVERYTHING_PROGS) .headers.stamp t_dir # Making this target will just make sure that the prototype files # exist, not necessarily that they are up to date. Since they're @@ -1572,9 +1580,9 @@ check: check-programs # because they're not all needed. check-programs: bin/t_strcmp bin/t_strstr bin/t_push_ucs2 bin/smbcontrol bin/t_snprintf -test: all - @if test -z "$(SMB4TORTURE)"; then \ - echo "Please set the SMB4TORTURE environment variable"; \ - exit 1; \ - fi - ./script/smb4torture.sh `pwd`/prefix-test $(SMB4TORTURE) +#test: all +# @if test -z "$(SMB4TORTURE)"; then \ +# echo "Please set the SMB4TORTURE environment variable"; \ +# exit 1; \ +# fi +# ./script/smb4torture.sh `pwd`/prefix-test $(SMB4TORTURE) diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace new file mode 100644 index 00000000000..2ea6a4d00a1 --- /dev/null +++ b/source3/script/tests/gdb_backtrace @@ -0,0 +1,41 @@ +#! /bin/sh +# +# Author: Andrew Tridgell + +# we want everything on stderr, so the program is not disturbed +exec 1>&2 + +BASENAME=$( basename $0) + +test -z ${GDB_BIN} && GDB_BIN=$( type -p gdb) +if [ -z ${GDB_BIN} ]; then + echo "ERROR: ${BASENAME} needs an installed gdb. " + exit 1 +fi + +if [ -z $1 ]; then + echo "ERROR: ${BASENAME} needs a PID. " + exit 1 +fi +PID=$1 + +# use /dev/shm as default temp directory +test -d /dev/shm && \ + TMP_BASE_DIR=/dev/shm || \ + TMP_BASE_DIR=/var/tmp +TMPFILE=$( mktemp -p ${TMP_BASE_DIR} backtrace.XXXXXX) +if [ $? -ne 0 ]; then + echo "ERROR: ${basename} can't create temp file in ${TMP_BASE_DIR}. " + exit 1 +fi + +cat << EOF > "${TMPFILE}" +set height 0 +up 8 +bt full +quit +EOF + +${GDB_BIN} -x "${TMPFILE}" "/proc/${PID}/exe" "${PID}" + +/bin/rm -f "${TMPFILE}" diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh new file mode 100644 index 00000000000..2483de97caf --- /dev/null +++ b/source3/script/tests/runtests.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +DOMAIN=SAMBA-TEST +export DOMAIN + +if [ "x$1" == "x" ]; then + echo "$0 " + exit 1 +fi + +PREFIX=`echo $1 | sed s+//+/+` + +mkdir -p $PREFIX || exit $? +OLD_PWD=`pwd` +cd $PREFIX || exit $? +export PREFIX_ABS=`pwd` +cd $OLD_PWD + +TMPDIR=$PREFIX_ABS/tmp +LIBDIR=$PREFIX_ABS/lib +PIDDIR=$PREFIX_ABS/pid +CONFFILE=$LIBDIR/smb.conf +PRIVATEDIR=$PREFIX_ABS/private +LOCKDIR=$PREFIX_ABS/lockdir +LOGDIR=$PREFIX_ABS/logs +SOCKET_WRAPPER_DIR=$PREFIX_ABS/sockwrap +CONFIGURATION="-s $CONFFILE" + +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 PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR + +cd script/tests +for testfile in t_*sh; do + sh $testfile +done + diff --git a/source3/script/tests/t_listing.sh b/source3/script/tests/t_listing.sh new file mode 100644 index 00000000000..06898076716 --- /dev/null +++ b/source3/script/tests/t_listing.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +cat >$CONFFILE<