diff options
| author | Michael Adam <obnox@samba.org> | 2011-02-15 22:54:06 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-02-16 12:56:41 +0100 |
| commit | dbc7896e3375e3ec14b8057fb77e85223e0a3467 (patch) | |
| tree | ec8dfccb8db84154b79cd9a013aaf98c3708ae5a | |
| parent | ad6c3ec3e52c7578884f65a3cf366bf9a6aafbda (diff) | |
| download | samba-dbc7896e3375e3ec14b8057fb77e85223e0a3467.tar.gz samba-dbc7896e3375e3ec14b8057fb77e85223e0a3467.tar.bz2 samba-dbc7896e3375e3ec14b8057fb77e85223e0a3467.zip | |
s3:test: use the blackbox subunit test driver in the net_registry tests.
| -rwxr-xr-x | source3/script/tests/test_net_registry.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index 525e13a811..2d8a135eb5 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -14,8 +14,8 @@ else fi test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && { -incdir=`dirname $0` -. $incdir/test_functions.sh +incdir=`dirname $0`/../../../testprogs/blackbox +. $incdir/subunit.sh } failed=0 @@ -420,11 +420,10 @@ conf_roundtrip() rm -r $DIR } -CONF_FILES=${CONF_FILES:-$(find $SRCDIR/.. -name *.conf | xargs grep -l "\[global\]")} +CONF_FILES=${CONF_FILES:-$(find $SRCDIR/ -name '*.conf' | xargs grep -l "\[global\]")} for conf_file in $CONF_FILES do - conf_file=${conf_file#$SRCDIR/} testit "conf_roundtrip $conf_file" \ conf_roundtrip $conf_file \ || failed=`expr $failed + 1` |