MFC r269534:

  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

MFC note: src.opts.mk in the original commit was changed to
          bsd.own.mk.

3 files changed, 0 insertions, 233 deletions

diff --git a/tools/regression/lib/libmp/Makefile b/tools/regression/lib/libmp/Makefile
deleted file mode 100644
index a6f60b6..0000000
--- a/tools/regression/lib/libmp/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-TESTS=	test-libmp
-CFLAGS+= -g -Wall -lcrypto -lmp
-
-.PHONY: tests
-tests: ${TESTS}
-	for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
-	-rm -f ${TESTS}
diff --git a/tools/regression/lib/libmp/test-libmp.c b/tools/regression/lib/libmp/test-libmp.c
deleted file mode 100644
index d9d2c9f..0000000
--- a/tools/regression/lib/libmp/test-libmp.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * Copyright (c) 2006, Simon L. Nielsen <simon@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <mp.h>
-#include <stdio.h>
-#include <string.h>
-#include <sysexits.h>
-
-MINT *c0, *c1, *c2, *c3, *c5, *c6, *c8, *c10, *c14, *c15, *c25, \
-    *c42,*c43, *c44, *c45, *t0, *t1;
-static int tnr = 0;
-
-static void
-testmcmp(const MINT *mp1, const MINT *mp2, const char *tname)
-{
-
-	if (mp_mcmp(mp1, mp2) == 0)
-		printf("ok %d - %s\n", ++tnr, tname);
-	else
-		printf("not ok - %d %s\n", ++tnr, tname);
-}
-
-static int
-testsimpel(void)
-{
-	const char str42[] = "2a";
-	MINT *t2;
-	char *s;
-
-	mp_madd(c42, c1, t0);
-	testmcmp(c43, t0, "madd0");
-	mp_madd(t0, c1, t0);
-	testmcmp(c44, t0, "madd1");
-	mp_msub(t0, c1, t0);
-	testmcmp(c43, t0, "msub0");
-	mp_msub(t0, c1, t0);
-	testmcmp(c42, t0, "msub1");
-	mp_move(c42, t0);
-	testmcmp(c42, t0, "move0");
-
-	t2 = mp_xtom(str42);
-	testmcmp(c42, t2, "xtom");
-	s = mp_mtox(t2);
-	if (strcmp(str42, s) == 0)
-		printf("ok %d - %s\n", ++tnr, "mtox0");
-	else
-		printf("not ok %d - %s\n", ++tnr, "mtox0");
-	mp_mfree(t2);
-}
-
-static int
-testgcd(void)
-{
-
-	mp_gcd(c10, c15, t0);
-	testmcmp(t0, c5, "gcd0");
-}
-
-static int
-testmsqrt(void)
-{
-
-	mp_msqrt(c25, t0, t1);
-	testmcmp(t0, c5, "msqrt0");
-	testmcmp(t1, c0, "msqrt1");
-	mp_msqrt(c42, t0, t1);
-	testmcmp(t0, c6, "msqrt2");
-	testmcmp(t1, c6, "msqrt3");
-}
-
-static int
-testdiv(void)
-{
-	short ro;
-	MINT *t2;
-
-	mp_mdiv(c42, c5, t0, t1);
-	testmcmp(t0, c8, "mdiv0");
-	testmcmp(t1, c2, "mdiv1");
-
-	mp_mdiv(c10, c8, t0, t1);
-	testmcmp(t0, c1, "mdiv2");
-	testmcmp(t1, c2, "mdiv3");
-
-	mp_sdiv(c42, 5, t0, &ro);
-	testmcmp(t0, c8, "sdiv0");
-	t2 = mp_itom(ro); // Simpler to use common testmcmp()
-	testmcmp(t2, c2, "sdiv1");
-	mp_mfree(t2);
-
-	mp_sdiv(c10, 8, t0, &ro);
-	testmcmp(t0, c1, "sdiv2");
-	t2 = mp_itom(ro); // Simpler to use common testmcmp()
-	testmcmp(t2, c2, "sdiv3");
-	mp_mfree(t2);
-}
-
-static int
-testmult(void)
-{
-
-	mp_mult(c5, c2, t0);
-	testmcmp(t0, c10, "mmult0");
-	mp_mult(c3, c14, t0);
-	testmcmp(t0, c42, "mmult1");
-}
-
-static int
-testpow(void)
-{
-
-	mp_pow(c2, c3, c10, t0);
-	testmcmp(t0, c8, "pow0");
-	mp_pow(c2, c3, c3, t0);
-	testmcmp(t0, c2, "pow1");
-	mp_rpow(c2, 3, t0);
-	testmcmp(t0, c8, "rpow0");
-}
-
-/*
- * This program performs some very basic tests of libmp(3).  It is by
- * no means expected to perform a complete test of the library for
- * correctness, but is meant to test the API to make sure libmp (or
- * libcrypto) updates don't totally break the library.
- */
-int
-main(int argc, char *argv[])
-{
-
-	printf("1..25\n");
-
-	/*
-	 * Init "constants" variables - done in this somewhat
-	 * cumbersome way to in theory be able to check for memory
-	 * leaks.
-	 */
-	c0 = mp_itom(0);
-	c1 = mp_itom(1);
-	c2 = mp_itom(2);
-	c3 = mp_itom(3);
-	c5 = mp_itom(5);
-	c6 = mp_itom(6);
-	c8 = mp_itom(8);
-	c10 = mp_itom(10);
-	c14 = mp_itom(14);
-	c15 = mp_itom(15);
-	c25 = mp_itom(25);
-	c42 = mp_itom(42);
-	c43 = mp_itom(43);
-	c44 = mp_itom(44);
-	c45 = mp_itom(45);
-
-	// Init temp variables
-	t0 = mp_itom(0);
-	t1 = mp_itom(0);
-
-	// Run tests
-	testsimpel();
-	testgcd();
-	testdiv();
-	testmult();
-	testpow();
-	testmsqrt();
-
-	// Cleanup
-	mp_mfree(c0);
-	mp_mfree(c1);
-	mp_mfree(c2);
-	mp_mfree(c3);
-	mp_mfree(c5);
-	mp_mfree(c6);
-	mp_mfree(c8);
-	mp_mfree(c10);
-	mp_mfree(c14);
-	mp_mfree(c15);
-	mp_mfree(c25);
-	mp_mfree(c42);
-	mp_mfree(c43);
-	mp_mfree(c44);
-	mp_mfree(c45);
-	mp_mfree(t0);
-	mp_mfree(t1);
-
-	return (EX_OK);
-}
diff --git a/tools/regression/lib/libmp/test-libmp.t b/tools/regression/lib/libmp/test-libmp.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/libmp/test-libmp.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable