diff options
| author | Martin Pool <mbp@samba.org> | 2001-08-31 05:49:16 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2001-08-31 05:49:16 +0000 |
| commit | 3aae15ecfba78001055a547f79f801ccdbc17158 (patch) | |
| tree | 19742012a8d32d14384a9f08fd5cb1e766408ccf /testsuite/daemon.test | |
| parent | f5ad6eb18d535a3133b221c1773469f85952053f (diff) | |
| download | rsync-3aae15ecfba78001055a547f79f801ccdbc17158.tar.gz | |
Fix rsyncd.conf generation.
Diffstat (limited to 'testsuite/daemon.test')
| -rw-r--r-- | testsuite/daemon.test | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/testsuite/daemon.test b/testsuite/daemon.test index 028fc788..869feab5 100644 --- a/testsuite/daemon.test +++ b/testsuite/daemon.test @@ -24,42 +24,7 @@ . "$suitedir/rsync.fns" -# Build an appropriate configuration file -conf="$scratchdir/test-rsyncd.conf" -echo "building configuration $conf" +build_rsyncd_conf +start_rsyncd -port=2612 -pidfile="$scratchdir/rsyncd.pid" -logfile="$scratchdir/rsyncd.log" -cat >$conf <<EOF -# rsyncd configuration file autogenerated by $0 - -pid file = $pidfile -use chroot = no -hosts allow = localhost, 127.0.0.1 -log file = $logfile - -[test-from] = $scratchdir/daemon-from/ - read only = yes - -[test-to] = $scratchdir/daemon-to/ - read only = no - -EOF - - - -echo starting daemon -$rsync_bin --daemon --port $port --config $conf -sleep 2 -pid=`cat "$pidfile"` -echo rsyncd running as process $pid - - -# We need to make sure that we always kill rsync, even if there's an -# error. Otherwise it might hang around, and be insecure or at any -# rate keep the port bound and prevent the tests running in the -# future. - -trap "echo killing off process $pid; kill $pid" EXIT |