This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH 13/15] Move all tests out of csu.


From: Nick Alcock <nick.alcock@oracle.com>

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.

v10: New.

	* csu/Makefile (tests): Move this...
	(tests-static): ... and this...
	* misc/Makefile (tests): ... to here...
	(tests-static): ... and here.
        * csu/tst-empty.c: Move to...
        * misc/tst-empty.c: ... here.
        * csu/tst-atomic.c: Move to...
        * misc/tst-atomic.c: ... here.
        * csu/tst-atomic-long.c: Move to...
        * misc/tst-atomic-long.c: ... here.
---
 csu/Makefile                    | 3 ---
 misc/Makefile                   | 5 ++++-
 {csu => misc}/tst-atomic-long.c | 0
 {csu => misc}/tst-atomic.c      | 0
 {csu => misc}/tst-empty.c       | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {csu => misc}/tst-atomic-long.c (100%)
 rename {csu => misc}/tst-atomic.c (100%)
 rename {csu => misc}/tst-empty.c (100%)

diff --git a/csu/Makefile b/csu/Makefile
index 22afe67..8e33cb1 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -42,9 +42,6 @@ install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
 generated += version-info.h
 before-compile += $(objpfx)version-info.h
 
-tests := tst-empty tst-atomic tst-atomic-long
-tests-static := tst-empty
-
 CFLAGS-.o += $(no-stack-protector)
 CFLAGS-.og += $(no-stack-protector)
 CFLAGS-.op += $(no-stack-protector)
diff --git a/misc/Makefile b/misc/Makefile
index c382f92..a390872 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -79,7 +79,10 @@ gpl2lgpl := error.c error.h
 tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
 	 tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \
 	 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)
 tests-special += $(objpfx)tst-error1-mem.out
 endif
diff --git a/csu/tst-atomic-long.c b/misc/tst-atomic-long.c
similarity index 100%
rename from csu/tst-atomic-long.c
rename to misc/tst-atomic-long.c
diff --git a/csu/tst-atomic.c b/misc/tst-atomic.c
similarity index 100%
rename from csu/tst-atomic.c
rename to misc/tst-atomic.c
diff --git a/csu/tst-empty.c b/misc/tst-empty.c
similarity index 100%
rename from csu/tst-empty.c
rename to misc/tst-empty.c
-- 
2.10.1.208.gbec66bc


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]