summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-03-07 18:27:28 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-03-07 18:27:28 +1100
commitb712fccc18b218e98bd6ef69c85308cd00a6e543 (patch)
tree47a21dd41f367b8c3104efcdd8c2fecc8541da38
parent68f7213a2cb1fa846d8eab215f1cde35e2abc20b (diff)
- 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@
-rw-r--r--ChangeLog5
-rw-r--r--regress/Makefile4
-rw-r--r--regress/test-exec.sh2
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 @@
5 - fgsch@cvs.openbsd.org 2004/12/10 01:31:30 5 - fgsch@cvs.openbsd.org 2004/12/10 01:31:30
6 [Makefile sftp-glob.sh] 6 [Makefile sftp-glob.sh]
7 some globbing regress; prompted and ok djm@ 7 some globbing regress; prompted and ok djm@
8 - david@cvs.openbsd.org 2005/01/14 04:21:18
9 [Makefile test-exec.sh]
10 pass the SUDO make variable to the individual sh tests; ok dtucker@ markus@
8 11
920050306 1220050306
10 - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor 13 - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor
@@ -2291,4 +2294,4 @@
2291 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2294 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2292 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2295 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2293 2296
2294$Id: ChangeLog,v 1.3696 2005/03/07 07:25:53 dtucker Exp $ 2297$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 @@
1# $OpenBSD: Makefile,v 1.34 2004/12/10 01:31:30 fgsch Exp $ 1# $OpenBSD: Makefile,v 1.35 2005/01/14 04:21:18 david Exp $
2 2
3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec 3REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec
4tests: $(REGRESS_TARGETS) 4tests: $(REGRESS_TARGETS)
@@ -92,5 +92,5 @@ t-exec: ${LTESTS:=.sh}
92 @if [ "x$?" = "x" ]; then exit 0; fi; \ 92 @if [ "x$?" = "x" ]; then exit 0; fi; \
93 for TEST in ""$?; do \ 93 for TEST in ""$?; do \
94 echo "run test $${TEST}" ... 1>&2; \ 94 echo "run test $${TEST}" ... 1>&2; \
95 (sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ 95 (env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
96 done 96 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 @@
1# $OpenBSD: test-exec.sh,v 1.25 2004/12/06 10:49:56 dtucker Exp $ 1# $OpenBSD: test-exec.sh,v 1.26 2005/01/14 04:21:18 david Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4#SUDO=sudo 4#SUDO=sudo