diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-27 20:29:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-27 21:10:30 +1000 |
| commit | 9e29b09d3928398dce1c15bb017cf840a0df597e (patch) | |
| tree | d5bba40dfaa7dba4dbcdf85049da9b301dda8db3 | |
| parent | a60889e00695ce2b0c85f01654d4fd42a892b009 (diff) | |
| download | samba-9e29b09d3928398dce1c15bb017cf840a0df597e.tar.gz samba-9e29b09d3928398dce1c15bb017cf840a0df597e.tar.bz2 samba-9e29b09d3928398dce1c15bb017cf840a0df597e.zip | |
s3-test Make samba3.blackbox.net.local.registry.roundtrip reliable
Looking for smb.conf files with find -name \*.conf would find and not
find all sorts of things that were just not valid inputs. When
restricted to under source3 it then finds no inputs in the top level
build, as it only worked on the generated smb.conf files from 'make
test' environments.
Instead, just run it on the one file we know is valid, and if we want
to run it on more files, then we can make this test run against more
environments, or specific target files.
Andrew Bartlett
| -rwxr-xr-x | source3/script/tests/test_net_registry_roundtrip.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/script/tests/test_net_registry_roundtrip.sh b/source3/script/tests/test_net_registry_roundtrip.sh index f35a752428..33114ccd4c 100755 --- a/source3/script/tests/test_net_registry_roundtrip.sh +++ b/source3/script/tests/test_net_registry_roundtrip.sh @@ -7,7 +7,7 @@ if [ $# -lt 3 ]; then cat <<EOF -Usage: test_net_registry_roundtrip.sh SCRIPTDIR SERVERCONFFILE CONFIGURATION +Usage: test_net_registry_roundtrip.sh SCRIPTDIR SERVERCONFFILE PREFIX CONFIGURATION EOF exit 1; fi @@ -144,7 +144,7 @@ conf_roundtrip() rm -r $DIR } -CONF_FILES=${CONF_FILES:-$(find $SRCDIR/source3 -name '*.conf' | grep -v examples/logon | xargs grep -l "\[global\]")} +CONF_FILES=$SERVERCONFFILE # remove old logs: for OLDDIR in $(find ${PREFIX} -type d -name "${LOGDIR_PREFIX}_*") ; do |