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.

5 files changed, 5 insertions, 5 deletions

diff --git a/src/regress/lib/libcrypto/Makefile b/src/regress/lib/libcrypto/Makefile
index a82ae259ea..dc11c60e92 100644
--- a/src/regress/lib/libcrypto/Makefile
+++ b/src/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/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
index 79232bcf39..85e50ecb04 100644
--- a/src/regress/lib/libssl/Makefile
+++ b/src/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/src/regress/lib/libcrypto/pqueue/Makefile b/src/regress/lib/libssl/pqueue/Makefile
index f20fafe1ec..48c2cb7e61 100644
--- a/src/regress/lib/libcrypto/pqueue/Makefile
+++ b/src/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/src/regress/lib/libcrypto/pqueue/expected.txt b/src/regress/lib/libssl/pqueue/expected.txt
index c59d6cd838..c59d6cd838 100644
--- a/src/regress/lib/libcrypto/pqueue/expected.txt
+++ b/src/regress/lib/libssl/pqueue/expected.txt
diff --git a/src/regress/lib/libcrypto/pqueue/pq_test.c b/src/regress/lib/libssl/pqueue/pq_test.c
index a078ba5366..a078ba5366 100644
--- a/src/regress/lib/libcrypto/pqueue/pq_test.c
+++ b/src/regress/lib/libssl/pqueue/pq_test.c