- david@cvs.openbsd.org 2005/01/14 04:21:18

     [Makefile test-exec.sh]
     pass the SUDO make variable to the individual sh tests; ok dtucker@ markus@

3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1949e264d..4d4f04909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
    - fgsch@cvs.openbsd.org 2004/12/10 01:31:30
      [Makefile sftp-glob.sh]
      some globbing regress; prompted and ok djm@
+   - david@cvs.openbsd.org 2005/01/14 04:21:18
+     [Makefile test-exec.sh]
+     pass the SUDO make variable to the individual sh tests; ok dtucker@ markus@
 
 20050306
  - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor
@@ -2291,4 +2294,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3696 2005/03/07 07:25:53 dtucker Exp $
+$Id: ChangeLog,v 1.3697 2005/03/07 07:27:28 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 0536ee7b9..eee1f3bf2 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.34 2004/12/10 01:31:30 fgsch Exp $
+#       $OpenBSD: Makefile,v 1.35 2005/01/14 04:21:18 david Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -92,5 +92,5 @@ t-exec:	${LTESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
                 echo "run test $${TEST}" ... 1>&2; \
-                (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
         done
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 4f10c2ba1..346b68f16 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.25 2004/12/06 10:49:56 dtucker Exp $
+#       $OpenBSD: test-exec.sh,v 1.26 2005/01/14 04:21:18 david Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo