← Back to branch summary

~ubuntu-branches/ubuntu/trusty/rsync/trusty

« back to all changes in this revision

Viewing changes to testsuite/rsync.fns

  • Committer: Package Import Robot
  • Author(s): Paul Slootman
  • Date: 2013-10-27 12:01:10 UTC
  • mfrom: (1.1.13) (2.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20131027120110-mpr03n5scqmf40mi
Tags: 3.1.0-2
http://bugs.debian.org/32379
fix build failure if zlib1g-dev package is not installed;
solved by building without the included zlib source and adding a
build-depends on zlib1g-dev >= 1:1.2.8
closes:32379

Show diffs side-by-side

added added

removed removed

Lines of Context:
testsuite/rsync.fns
17
17
# License along with this program; if not, write to the Free Software
18
18
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19
19
 
20
 
 
21
20
tmpdir="$scratchdir"
22
21
fromdir="$tmpdir/from"
23
22
todir="$tmpdir/to"
32
31
# Berkley's nice.
33
32
PATH="$PATH:/usr/ucb"
34
33
 
35
 
if diff -u "$srcdir/testsuite/rsync.fns" "$srcdir/testsuite/rsync.fns" >/dev/null 2>&1; then
 
34
if diff -u "$suitedir/rsync.fns" "$suitedir/rsync.fns" >/dev/null 2>&1; then
36
35
    diffopt="-u"
37
36
else
38
37
    diffopt="-c"
263
262
    logfile="$scratchdir/rsyncd.log"
264
263
    hostname=`uname -n`
265
264
 
 
265
    uid_setting='uid = 0'
 
266
    gid_setting='gid = 0'
 
267
    case `get_testuid` in
 
268
    0) ;;
 
269
    *)
 
270
        # Non-root cannot specify uid & gid settings
 
271
        uid_setting="#$uid_setting"
 
272
        gid_setting="#$gid_setting"
 
273
        ;;
 
274
    esac
 
275
 
266
276
    cat >"$conf" <<EOF
267
277
# rsyncd configuration file autogenerated by $0
268
278
 
274
284
log format = %i %h [%a] %m (%u) %l %f%L
275
285
transfer logging = yes
276
286
exclude = ? foobar.baz
277
 
max verbosity = 9
278
 
uid = 0
279
 
gid = 0
 
287
max verbosity = 4
 
288
$uid_setting
 
289
$gid_setting
280
290
 
281
291
[test-from]
282
292
        path = $fromdir