summaryrefslogtreecommitdiff
path: root/regress/lib
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2016-11-04 19:45:13 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2016-11-04 19:45:13 +0000
commit3e323453bbacb247a030790fe3d94c167b762097 (patch)
tree2266428308d65cad4562c9fdfbae76fbd5676d0b /regress/lib
parentcb147fa7674b11623a346c47f551fc5a06377ac5 (diff)
Move pqueue regress from libcrypto to libssl, since that's where the pqueue
code now lives. Also unbreak the regress following the symbol hiding changes in libssl.
Diffstat (limited to 'regress/lib')
-rw-r--r--regress/lib/libcrypto/Makefile3
-rw-r--r--regress/lib/libssl/Makefile3
-rw-r--r--regress/lib/libssl/pqueue/Makefile (renamed from regress/lib/libcrypto/pqueue/Makefile)4
-rw-r--r--regress/lib/libssl/pqueue/expected.txt (renamed from regress/lib/libcrypto/pqueue/expected.txt)0
-rw-r--r--regress/lib/libssl/pqueue/pq_test.c (renamed from regress/lib/libcrypto/pqueue/pq_test.c)0
5 files changed, 5 insertions, 5 deletions
diff --git a/regress/lib/libcrypto/Makefile b/regress/lib/libcrypto/Makefile
index a82ae259eaa..dc11c60e92d 100644
--- a/regress/lib/libcrypto/Makefile
+++ b/regress/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2016/07/04 23:43:30 beck Exp $
+# $OpenBSD: Makefile,v 1.24 2016/11/04 19:45:12 jsing Exp $
SUBDIR= \
aead \
@@ -31,7 +31,6 @@ SUBDIR= \
pbkdf2 \
pkcs7 \
poly1305 \
- pqueue \
rand \
rc2 \
rc4 \
diff --git a/regress/lib/libssl/Makefile b/regress/lib/libssl/Makefile
index 79232bcf392..85e50ecb046 100644
--- a/regress/lib/libssl/Makefile
+++ b/regress/lib/libssl/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2015/09/01 17:02:17 jsing Exp $
+# $OpenBSD: Makefile,v 1.24 2016/11/04 19:45:12 jsing Exp $
SUBDIR= \
asn1 \
bytestring \
ciphers \
client \
+ pqueue \
ssl \
unit
diff --git a/regress/lib/libcrypto/pqueue/Makefile b/regress/lib/libssl/pqueue/Makefile
index f20fafe1ec7..48c2cb7e61f 100644
--- a/regress/lib/libcrypto/pqueue/Makefile
+++ b/regress/lib/libssl/pqueue/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2016/09/02 17:02:53 beck Exp $
+# $OpenBSD: Makefile,v 1.1 2016/11/04 19:45:12 jsing Exp $
PROG= pq_test
SRC= ${.CURDIR}/../../../../lib/libssl
CFLAGS+= -I${SRC}
-LDADD= -lssl -lcrypto
+LDADD= ${SSL_INT} -lcrypto
DPADD= ${LIBSSL} ${LIBCRYPTO}
WARNINGS= Yes
CFLAGS+= -DLIBRESSL_INTERNAL -Werror
diff --git a/regress/lib/libcrypto/pqueue/expected.txt b/regress/lib/libssl/pqueue/expected.txt
index c59d6cd8381..c59d6cd8381 100644
--- a/regress/lib/libcrypto/pqueue/expected.txt
+++ b/regress/lib/libssl/pqueue/expected.txt
diff --git a/regress/lib/libcrypto/pqueue/pq_test.c b/regress/lib/libssl/pqueue/pq_test.c
index a078ba53666..a078ba53666 100644
--- a/regress/lib/libcrypto/pqueue/pq_test.c
+++ b/regress/lib/libssl/pqueue/pq_test.c