From e4ae345dc75b34fd870c2e8690d831d2c1088eb7 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Thu, 22 Nov 2018 08:48:32 +0000 Subject: upstream: Append pid to temp files in /var/run and set a cleanup trap for them. This allows multiple instances of tests to run without colliding. OpenBSD-Regress-ID: 57add105ecdfc54752d8003acdd99eb68c3e0b4c --- regress/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'regress/Makefile') diff --git a/regress/Makefile b/regress/Makefile index 647b4a049..c733dcbd9 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.97 2018/06/07 04:46:34 djm Exp $ +# $OpenBSD: Makefile,v 1.98 2018/11/22 08:48:32 dtucker Exp $ REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec tests: prep $(REGRESS_TARGETS) @@ -122,8 +122,6 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ t8.out t8.out.pub t9.out t9.out.pub testdata \ user_*key* user_ca* user_key* -SUDO_CLEAN+= /var/run/testdata_${USERNAME} /var/run/keycommand_${USERNAME} - # Enable all malloc(3) randomisations and checks TEST_ENV= "MALLOC_OPTIONS=CFGJRSUX" -- cgit v1.2.3 From bb542f0cf6f7511a22a08c492861e256a82376a9 Mon Sep 17 00:00:00 2001 From: "tedu@openbsd.org" Date: Sat, 15 Dec 2018 00:50:21 +0000 Subject: upstream: remove unused and problematic sudo clean. ok espie OpenBSD-Regress-ID: ca90c20a15a85b661e13e98b80c10e65cd662f7b --- regress/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'regress/Makefile') diff --git a/regress/Makefile b/regress/Makefile index c733dcbd9..62e55533b 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.98 2018/11/22 08:48:32 dtucker Exp $ +# $OpenBSD: Makefile,v 1.99 2018/12/15 00:50:21 tedu Exp $ REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec tests: prep $(REGRESS_TARGETS) @@ -11,7 +11,6 @@ prep: clean: for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done - test -z "${SUDO}" || ${SUDO} rm -f ${SUDO_CLEAN} rm -rf $(OBJ).putty distclean: clean -- cgit v1.2.3 From b2ce8b31a1f974a13e6d12e0a0c132b50bc45115 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sun, 20 Jan 2019 23:24:19 +0000 Subject: upstream: add "extra:" target to run some extra tests that are not enabled by default (currently includes agent-pkcs11.sh); from markus@ OpenBSD-Regress-ID: 9a969e1adcd117fea174d368dcb9c61eb50a2a3c --- regress/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'regress/Makefile') diff --git a/regress/Makefile b/regress/Makefile index 62e55533b..925edf71a 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.99 2018/12/15 00:50:21 tedu Exp $ +# $OpenBSD: Makefile,v 1.100 2019/01/20 23:24:19 djm Exp $ REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec tests: prep $(REGRESS_TARGETS) @@ -91,7 +91,8 @@ LTESTS= connect \ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp -#LTESTS= cipher-speed +EXTRA_TESTS= agent-pkcs11 +#EXTRA_TESTS+= cipher-speed USERNAME= ${LOGNAME} CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ @@ -214,6 +215,13 @@ t-exec-interop: ${INTEROP_TESTS:=.sh} (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ done +t-extra: ${EXTRA_TESTS:=.sh} + @if [ "x$?" = "x" ]; then exit 0; fi; \ + for TEST in ""$?; do \ + echo "run test $${TEST}" ... 1>&2; \ + (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ + done + # Not run by default interop: ${INTEROP_TARGETS} -- cgit v1.2.3