diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | testsuite/chgrp.test | 2 | ||||
| -rw-r--r-- | testsuite/rsync.fns | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 331c00af..b6e0350f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,7 @@ OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@ TLS_OBJ = tls.o syscall.o lib/permstring.o # Programs we must have to run the test cases -CHECK_PROGS = rsync tls +CHECK_PROGS = rsync tls getgroups # note that the -I. is needed to handle config.h when using VPATH .c.o: @@ -135,14 +135,14 @@ test: check # might lose in the future where POSIX diverges from old sh. check: all $(CHECK_PROGS) - POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh + POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh # This does *not* depend on building or installing: you can use it to # check a version installed from a binary or some other source tree, # if you want. installcheck: $(CHECK_PROGS) - POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh + POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh # TODO: Add 'dist' target; need to know which files will be included diff --git a/testsuite/chgrp.test b/testsuite/chgrp.test index 8cc89e04..33aef146 100644 --- a/testsuite/chgrp.test +++ b/testsuite/chgrp.test @@ -20,7 +20,7 @@ todir="$scratchdir/to" # TODO: I guess some systems will not have 'id', and therefore we have # to ship or emulate it. -mygrps="`id -G`" || fail "Can't get groups" +mygrps="`rsync_getgroups`" || fail "Can't get groups" mkdir "$fromdir" for g in $mygrps diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index e7e2e2d7..e7f753a9 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -45,7 +45,11 @@ printmsg() { rsync_ls_lR() { - find "$@" -print | sort | xargs $TLS + find "$@" -print | sort | xargs "$TOOLDIR/tls" +} + +rsync_getgroups() { + "$TOOLDIR/getgroups" } |