13 files changed, 7 insertions, 55 deletions

diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index dfac5a252f28..bbf0f01d7042 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -39,12 +39,19 @@ NETBSD_ATF_TESTS_C+=	tanh_test
 TAP_TESTS_C+=	cexp_test
 TAP_TESTS_C+=	conj_test
 TAP_TESTS_C+=	csqrt_test
+TAP_TESTS_C+=	ctrig_test
+TAP_TESTS_C+=	exponential_test
 TAP_TESTS_C+=	fenv_test
+TAP_TESTS_C+=	fma_test
 TAP_TESTS_C+=	fmaxmin_test
 TAP_TESTS_C+=	ilogb_test
+TAP_TESTS_C+=	invtrig_test
 TAP_TESTS_C+=	invctrig_test
 TAP_TESTS_C+=	logarithm_test
 TAP_TESTS_C+=	lrint_test
+# XXX: the testcase crashes on all platforms, but only on head
+# (bug 205451)
+#TAP_TESTS_C+=	lround_test
 TAP_TESTS_C+=	nan_test
 TAP_TESTS_C+=	nearbyint_test
 TAP_TESTS_C+=	next_test
@@ -53,7 +60,6 @@ TAP_TESTS_C+=	trig_test
 
 .for t in ${TAP_TESTS_C}
 CFLAGS.$t+=	-O0
-CFLAGS.$t+=	-I${SRCTOP}/tools/regression/lib/msun
 .endfor
 
 CSTD=		c99
diff --git a/tools/regression/lib/msun/test-ctrig.c b/lib/msun/tests/ctrig_test.c
index 475b6c5f8daf..475b6c5f8daf 100644
--- a/tools/regression/lib/msun/test-ctrig.c
+++ b/lib/msun/tests/ctrig_test.c
diff --git a/tools/regression/lib/msun/test-exponential.c b/lib/msun/tests/exponential_test.c
index df552eef5e99..df552eef5e99 100644
--- a/tools/regression/lib/msun/test-exponential.c
+++ b/lib/msun/tests/exponential_test.c
diff --git a/tools/regression/lib/msun/test-fma.c b/lib/msun/tests/fma_test.c
index af7910e65f27..af7910e65f27 100644
--- a/tools/regression/lib/msun/test-fma.c
+++ b/lib/msun/tests/fma_test.c
diff --git a/tools/regression/lib/msun/test-invtrig.c b/lib/msun/tests/invtrig_test.c
index 01b0379e4d89..01b0379e4d89 100644
--- a/tools/regression/lib/msun/test-invtrig.c
+++ b/lib/msun/tests/invtrig_test.c
diff --git a/tools/regression/lib/msun/test-lround.c b/lib/msun/tests/lround_test.c
index 2a373670f911..2a373670f911 100644
--- a/tools/regression/lib/msun/test-lround.c
+++ b/lib/msun/tests/lround_test.c
diff --git a/tools/regression/lib/msun/test-ctrig.t b/lib/msun/tests/lround_test.t
index 8bdfd03be81b..8bdfd03be81b 100644
--- a/tools/regression/lib/msun/test-ctrig.t
+++ b/lib/msun/tests/lround_test.t
diff --git a/tools/regression/lib/msun/test-utils.h b/lib/msun/tests/test-utils.h
index bf0d6dee85e7..bf0d6dee85e7 100644
--- a/tools/regression/lib/msun/test-utils.h
+++ b/lib/msun/tests/test-utils.h
diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
deleted file mode 100644
index 4f48e821e74f..000000000000
--- a/tools/regression/lib/msun/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-TESTS=	test-ctrig \
-	test-exponential test-fma test-invtrig \
-	test-lround
-CFLAGS+= -O0 -lm -Wno-unknown-pragmas
-
-.PHONY: tests
-tests: ${TESTS}
-	for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
-	-rm -f ${TESTS}
diff --git a/tools/regression/lib/msun/test-exponential.t b/tools/regression/lib/msun/test-exponential.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-exponential.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
diff --git a/tools/regression/lib/msun/test-fma.t b/tools/regression/lib/msun/test-fma.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-fma.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
diff --git a/tools/regression/lib/msun/test-invtrig.t b/tools/regression/lib/msun/test-invtrig.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-invtrig.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
diff --git a/tools/regression/lib/msun/test-lround.t b/tools/regression/lib/msun/test-lround.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/msun/test-lround.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