summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-06-30 08:06:51 +1000
committerDamien Miller <djm@mindrot.org>2008-06-30 08:06:51 +1000
commitd9bfce83b73409f1e37cb051aaa28c307e0e28e1 (patch)
treeb378e8dd2b05257222b6ee021c1c3a2bbaacf6e4
parent2e80cf2b63ada08b7ff7d6a80fca254c231559aa (diff)
- dtucker@cvs.openbsd.org 2008/06/11 23:11:40
[Makefile] Don't run cipher-speed test by default; mistakenly enabled by me
-rw-r--r--ChangeLog5
-rw-r--r--regress/Makefile3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fc9c204a..3e2a3fd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - dtucker@cvs.openbsd.org 2008/06/10 23:13:43 3 - dtucker@cvs.openbsd.org 2008/06/10 23:13:43
4 [regress/Makefile regress/key-options.sh] 4 [regress/Makefile regress/key-options.sh]
5 Add regress test for key options. ok djm@ 5 Add regress test for key options. ok djm@
6 - dtucker@cvs.openbsd.org 2008/06/11 23:11:40
7 [Makefile]
8 Don't run cipher-speed test by default; mistakenly enabled by me
6 9
720080629 1020080629
8 - (djm) OpenBSD CVS Sync 11 - (djm) OpenBSD CVS Sync
@@ -4471,4 +4474,4 @@
4471 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4474 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4472 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4475 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4473 4476
4474$Id: ChangeLog,v 1.5035 2008/06/29 22:06:25 djm Exp $ 4477$Id: ChangeLog,v 1.5036 2008/06/29 22:06:51 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 492f84d7c..6ec310fb7 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.46 2008/06/10 23:13:43 dtucker Exp $ 1# $OpenBSD: Makefile,v 1.47 2008/06/11 23:11:40 dtucker 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)
@@ -50,7 +50,6 @@ LTESTS= connect \
50 cfgmatch \ 50 cfgmatch \
51 addrmatch \ 51 addrmatch \
52 localcommand \ 52 localcommand \
53 cipher-speed \
54 forcecommand 53 forcecommand
55 54
56INTEROP_TESTS= putty-transfer putty-ciphers putty-kex 55INTEROP_TESTS= putty-transfer putty-ciphers putty-kex