diff options
Diffstat (limited to 'source3/script/tests')
| -rwxr-xr-x | source3/script/tests/stream-depot/run.sh | 37 | ||||
| -rw-r--r-- | source3/script/tests/stream-depot/smb.conf | 5 |
2 files changed, 32 insertions, 10 deletions
diff --git a/source3/script/tests/stream-depot/run.sh b/source3/script/tests/stream-depot/run.sh index f1e75fbf71..38ef283294 100755 --- a/source3/script/tests/stream-depot/run.sh +++ b/source3/script/tests/stream-depot/run.sh @@ -1,9 +1,36 @@ #!/bin/sh -rm -r .streams -../../../bin/vfstest -s smb.conf -f vfstest.cmd +if [ $# -lt 2 ]; then +cat <<EOF +Usage: run.sh VFSTEST PREFIX +EOF +exit 1; +fi + +TESTBASE=`dirname $0` +VFSTEST=$1 +PREFIX=$2 +shift 2 +ADDARGS="$*" + +VFSTEST_PREFIX=vfstest +VFSTEST_TMPDIR=$(mktemp -d ${PREFIX}/${VFSTEST_PREFIX}_XXXXXX) + +incdir=`dirname $0`/../../../../testprogs/blackbox +. $incdir/subunit.sh + +failed=0 + +cd $VFSTEST_TMPDIR || exit 1 + +testit "vfstest" $VFSTEST -f $TESTBASE/vfstest.cmd $ADDARGS || failed=`expr $failed + 1` +testname=".streams check" +subunit_start_test $testname NUM=`find .streams | wc -l` if [ $NUM -ne 3 ] ; then - echo "streams_depot left ${NUM} in .streams, expected 3" - exit 1 +echo "streams_depot left ${NUM} in .streams, expected 3" | subunit_fail_test $testname + failed=`expr $failed + 1` +else + subunit_pass_test $testname fi -exit 0 + +exit $failed diff --git a/source3/script/tests/stream-depot/smb.conf b/source3/script/tests/stream-depot/smb.conf deleted file mode 100644 index 426d23c949..0000000000 --- a/source3/script/tests/stream-depot/smb.conf +++ /dev/null @@ -1,5 +0,0 @@ -[tmp] -# "path" is ignored by vfstest, it's always set to $(pwd) -path = /tmp -writable = yes -vfs objects = streams_depot xattr_tdb |