svn commit: r269534 - in head: etc/mtree lib/libmp lib/libmp/tests tools/regression/lib/libmp

[Garrett Cooper]

Author: ngie
Date: Mon Aug  4 22:10:07 2014
New Revision: 269534
URL: http://svnweb.freebsd.org/changeset/base/269534

Log:
  Integrate lib/libmp into the build/kyua
  
  - Remove the .t wrapper
  - Fix -Wreturn-type warnings with clang
  
  This change has been tested on amd64/i386
  
  Phabric: D530
  Reviewed by: jmmv
  Approved by: jmmv (co-mentor)
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/lib/libmp/tests/
  head/lib/libmp/tests/Makefile   (contents, props changed)
  head/lib/libmp/tests/legacy_test.c
     - copied, changed from r269429, head/tools/regression/lib/libmp/test-libmp.c
Deleted:
  head/tools/regression/lib/libmp/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/lib/libmp/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Mon Aug  4 22:03:58 2014	(r269533)
+++ head/etc/mtree/BSD.tests.dist	Mon Aug  4 22:10:07 2014	(r269534)
@@ -85,6 +85,8 @@
             ..
             libcrypt
             ..
+            libmp
+            ..
         ..
         libexec
             atf

Modified: head/lib/libmp/Makefile
==============================================================================
--- head/lib/libmp/Makefile	Mon Aug  4 22:03:58 2014	(r269533)
+++ head/lib/libmp/Makefile	Mon Aug  4 22:10:07 2014	(r269534)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 LIB=		mp
 SHLIB_MAJOR=	7
 DPADD=		${LIBCRYPTO}
@@ -13,4 +15,8 @@ CFLAGS+=	-I${.CURDIR}/../../crypto
 VERSION_DEF=	${.CURDIR}/../libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.lib.mk>

Added: head/lib/libmp/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libmp/tests/Makefile	Mon Aug  4 22:10:07 2014	(r269534)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/lib/libmp
+
+TAP_TESTS_C+=	legacy_test
+
+DPADD+=		${LIBCRYPTO} ${LIBMP}
+LDADD+=		-lcrypto -lmp
+
+.include <bsd.test.mk>

Copied and modified: head/lib/libmp/tests/legacy_test.c (from r269429, head/tools/regression/lib/libmp/test-libmp.c)
==============================================================================
--- head/tools/regression/lib/libmp/test-libmp.c	Sat Aug  2 06:56:00 2014	(r269429, copy source)
+++ head/lib/libmp/tests/legacy_test.c	Mon Aug  4 22:10:07 2014	(r269534)
@@ -46,7 +46,7 @@ testmcmp(const MINT *mp1, const MINT *mp
 		printf("not ok - %d %s\n", ++tnr, tname);
 }
 
-static int
+static void
 testsimpel(void)
 {
 	const char str42[] = "2a";
@@ -74,7 +74,7 @@ testsimpel(void)
 	mp_mfree(t2);
 }
 
-static int
+static void
 testgcd(void)
 {
 
@@ -82,7 +82,7 @@ testgcd(void)
 	testmcmp(t0, c5, "gcd0");
 }
 
-static int
+static void
 testmsqrt(void)
 {
 
@@ -94,7 +94,7 @@ testmsqrt(void)
 	testmcmp(t1, c6, "msqrt3");
 }
 
-static int
+static void
 testdiv(void)
 {
 	short ro;
@@ -121,7 +121,7 @@ testdiv(void)
 	mp_mfree(t2);
 }
 
-static int
+static void
 testmult(void)
 {
 
@@ -131,7 +131,7 @@ testmult(void)
 	testmcmp(t0, c42, "mmult1");
 }
 
-static int
+static void
 testpow(void)
 {