Move all tests out of the csu subdirectory

Stack-protection on .o files in csu/ must be suppressed for the sake of
library startup code.  This also suppresses stack-protection in tests
(which are also covered by CFLAGS-.o), though this is neither necessary
nor desirable.

So impose the rule that .o files in csu/ are necessarily C startup code,
and move the few tests in there into misc/ instead.
This commit is contained in:
Nick Alcock 2016-12-21 11:52:19 +01:00 committed by Florian Weimer
parent 2fe82ca6dc
commit 2908885c82
6 changed files with 25 additions and 7 deletions

View File

@ -1,3 +1,19 @@
2016-12-21 Nick Alcock <nick.alcock@oracle.com>
Florian Weimer <fweimer@redhat.com>
[BZ #7065]
* csu/Makefile (tests): Empty assignment and document it.
(tests-static): Remove.
* csu/tst-empty.c: Move to...
* misc/tst-empty.c: ... here. Switch to new test driver.
* csu/tst-atomic.c: Move to...
* misc/tst-atomic.c: ... here. Switch to new test driver.
* csu/tst-atomic-long.c: Move to...
* misc/tst-atomic-long.c: ... here.
* misc/Makefile (tests): Add tst-empty, tst-atomic,
tst-atomic-long.
(tests-static): Add tst-empty.
2016-12-21 Rical Jasan <ricaljasan@pacific.net> 2016-12-21 Rical Jasan <ricaljasan@pacific.net>
* manual/nss.texi: Change incorrect @vtable to @table. * manual/nss.texi: Change incorrect @vtable to @table.

View File

@ -42,8 +42,9 @@ install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
generated += version-info.h generated += version-info.h
before-compile += $(objpfx)version-info.h before-compile += $(objpfx)version-info.h
tests := tst-empty tst-atomic tst-atomic-long # No tests are allowed in the csu/ subdirectory because the startup
tests-static := tst-empty # code is compiled with special flags.
tests =
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
extra-objs += S$(start-installed-name) gmon-start.os extra-objs += S$(start-installed-name) gmon-start.os

View File

@ -79,7 +79,10 @@ gpl2lgpl := error.c error.h
tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \ tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \
tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \
tst-preadvwritev tst-preadvwritev64 tst-makedev tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \
tst-atomic tst-atomic-long
tests-static := tst-empty
ifeq ($(run-built-tests),yes) ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-error1-mem.out tests-special += $(objpfx)tst-error1-mem.out
endif endif

View File

@ -636,5 +636,4 @@ do_test (void)
return ret; return ret;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -5,5 +5,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"