summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorkamil <kamil@NetBSD.org>2017-05-14 02:30:27 +0000
committerkamil <kamil@NetBSD.org>2017-05-14 02:30:27 +0000
commit610d2dcc9807025f938fa46bb12fdfc9047e4feb (patch)
tree00b987826889db0e4d81693b4d17d94464e6ca2e /regress
parent4fb73da605700789e949d9b9099f7ebe2f976d09 (diff)
Drop usr.bin/rtld/testlib, replaced with ATF tests in usr.bin/c++/*
This regress tests used to check dynamically loaded objects: constructor/destructor call for static objects, C++ runtime support. This is mostly - although without virtual functions, inheritance - covered by existing ATF tests. Stop descending into regress/usr.bin.
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile5
-rw-r--r--regress/usr.bin/Makefile7
-rw-r--r--regress/usr.bin/rtld/Makefile9
-rw-r--r--regress/usr.bin/rtld/testlib/Makefile27
-rw-r--r--regress/usr.bin/rtld/testlib/ccexc.cc14
-rw-r--r--regress/usr.bin/rtld/testlib/construct.cc25
-rw-r--r--regress/usr.bin/rtld/testlib/virt.cc15
7 files changed, 2 insertions, 100 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 32c2c054bba..05209ab84d2 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2010/07/18 12:44:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2017/05/14 02:30:27 kamil Exp $
-# missing: libexec sbin usr.sbin share
-SUBDIR+= lib libexec sys usr.bin
+SUBDIR+= lib libexec sys
.include <bsd.subdir.mk>
diff --git a/regress/usr.bin/Makefile b/regress/usr.bin/Makefile
deleted file mode 100644
index 7b876895207..00000000000
--- a/regress/usr.bin/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2017/05/14 02:07:58 kamil Exp $
-
-.include <bsd.own.mk>
-
-SUBDIR+= rtld
-
-.include <bsd.subdir.mk>
diff --git a/regress/usr.bin/rtld/Makefile b/regress/usr.bin/rtld/Makefile
deleted file mode 100644
index 11cd4adf042..00000000000
--- a/regress/usr.bin/rtld/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2010/12/14 06:02:21 skrll Exp $
-
-.include <bsd.own.mk>
-
-.if ${MKCXX} != "no"
-SUBDIR+= testlib
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/regress/usr.bin/rtld/testlib/Makefile b/regress/usr.bin/rtld/testlib/Makefile
deleted file mode 100644
index 5030a5957db..00000000000
--- a/regress/usr.bin/rtld/testlib/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2012/08/10 16:04:28 joerg Exp $
-
-NOPROFILE= yes
-
-SRCS= ccexc.cc construct.cc virt.cc
-
-LIB= test
-LIBISCXX= yes
-TESTLIB= testlib.so
-
-CLEANFILES+= ${TESTLIB}
-SHLIB_MAJOR= 1
-SHLIB_MINOR= 0
-#CXXFLAGS+= -fno-rtti
-
-.if ${MACHINE_ARCH} == "i386" && "${MKPIC}" != "no"
-all realall: ${TESTLIB}
-.else
-all realall:
-.endif
-
-${TESTLIB}: lib${LIB}.so.1.0
- cp lib${LIB}.so.1.0 ${TESTLIB}
-
-regress:
-
-.include <bsd.lib.mk>
diff --git a/regress/usr.bin/rtld/testlib/ccexc.cc b/regress/usr.bin/rtld/testlib/ccexc.cc
deleted file mode 100644
index 48303608ddf..00000000000
--- a/regress/usr.bin/rtld/testlib/ccexc.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// $NetBSD: ccexc.cc,v 1.1 2000/12/08 19:21:28 drochner Exp $
-
-// generate references to exception handling runtime code
-
-extern "C" void ccexc(void);
-
-void
-ccexc(void)
-{
- try {
- throw "mist";
- } catch (char *e) {
- }
-}
diff --git a/regress/usr.bin/rtld/testlib/construct.cc b/regress/usr.bin/rtld/testlib/construct.cc
deleted file mode 100644
index 91602493093..00000000000
--- a/regress/usr.bin/rtld/testlib/construct.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $NetBSD: construct.cc,v 1.2 2003/09/03 20:53:16 drochner Exp $
-
-// check constructor / destructor calls
-
-#include <iostream>
-
-using namespace std;
-
-class mist {
-public:
- mist(void);
- ~mist();
-};
-
-mist::mist(void)
-{
- cout << "constructor" << endl;
-}
-
-mist::~mist()
-{
- cout << "destructor" << endl;
-}
-
-static mist construct;
diff --git a/regress/usr.bin/rtld/testlib/virt.cc b/regress/usr.bin/rtld/testlib/virt.cc
deleted file mode 100644
index c2655ba5d08..00000000000
--- a/regress/usr.bin/rtld/testlib/virt.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-// $NetBSD: virt.cc,v 1.1 2000/12/08 19:21:28 drochner Exp $
-
-// g++ generates a reference to "__pure_virtual" with this code
-
-class mist {
-public:
- virtual void vv(void) = 0;
-};
-
-class mast: public mist {
-public:
- void vv(void) {};
-};
-
-static mast virt;