From 610d2dcc9807025f938fa46bb12fdfc9047e4feb Mon Sep 17 00:00:00 2001 From: kamil Date: Sun, 14 May 2017 02:30:27 +0000 Subject: 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. --- regress/Makefile | 5 ++--- regress/usr.bin/Makefile | 7 ------- regress/usr.bin/rtld/Makefile | 9 --------- regress/usr.bin/rtld/testlib/Makefile | 27 --------------------------- regress/usr.bin/rtld/testlib/ccexc.cc | 14 -------------- regress/usr.bin/rtld/testlib/construct.cc | 25 ------------------------- regress/usr.bin/rtld/testlib/virt.cc | 15 --------------- 7 files changed, 2 insertions(+), 100 deletions(-) delete mode 100644 regress/usr.bin/Makefile delete mode 100644 regress/usr.bin/rtld/Makefile delete mode 100644 regress/usr.bin/rtld/testlib/Makefile delete mode 100644 regress/usr.bin/rtld/testlib/ccexc.cc delete mode 100644 regress/usr.bin/rtld/testlib/construct.cc delete mode 100644 regress/usr.bin/rtld/testlib/virt.cc (limited to 'regress') 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 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 - -SUBDIR+= rtld - -.include 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 - -.if ${MKCXX} != "no" -SUBDIR+= testlib -.endif - -.include 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 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 - -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; -- cgit