This is the mail archive of the glibc-cvs@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]

GNU C Library master sources branch master updated. glibc-2.24-508-g2908885


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  2908885c822eb43ffa2cdd67e0464e6d35afaf53 (commit)
      from  2fe82ca6dc5a2d2ffc91b7df9d136de7bf10bd9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2908885c822eb43ffa2cdd67e0464e6d35afaf53

commit 2908885c822eb43ffa2cdd67e0464e6d35afaf53
Author: Nick Alcock <nick.alcock@oracle.com>
Date:   Wed Dec 21 11:52:19 2016 +0100

    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.

diff --git a/ChangeLog b/ChangeLog
index 48227ec..bb47685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* manual/nss.texi: Change incorrect @vtable to @table.
diff --git a/csu/Makefile b/csu/Makefile
index 31e8bb9..3d23f13 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -42,8 +42,9 @@ 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
+# No tests are allowed in the csu/ subdirectory because the startup
+# code is compiled with special flags.
+tests =
 
 ifeq (yes,$(build-shared))
 extra-objs += S$(start-installed-name) gmon-start.os
diff --git a/misc/Makefile b/misc/Makefile
index 3d2ebb8..d241dae 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 99%
rename from csu/tst-atomic.c
rename to misc/tst-atomic.c
index f7dcac1..720b865 100644
--- a/csu/tst-atomic.c
+++ b/misc/tst-atomic.c
@@ -636,5 +636,4 @@ do_test (void)
   return ret;
 }
 
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/csu/tst-empty.c b/misc/tst-empty.c
similarity index 58%
rename from csu/tst-empty.c
rename to misc/tst-empty.c
index e99468e..31860b0 100644
--- a/csu/tst-empty.c
+++ b/misc/tst-empty.c
@@ -5,5 +5,4 @@ do_test (void)
   return 0;
 }
 
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                       |   16 ++++++++++++++++
 csu/Makefile                    |    5 +++--
 misc/Makefile                   |    5 ++++-
 {csu => misc}/tst-atomic-long.c |    0
 {csu => misc}/tst-atomic.c      |    3 +--
 {csu => misc}/tst-empty.c       |    3 +--
 6 files changed, 25 insertions(+), 7 deletions(-)
 rename {csu => misc}/tst-atomic-long.c (100%)
 rename {csu => misc}/tst-atomic.c (99%)
 rename {csu => misc}/tst-empty.c (58%)


hooks/post-receive
-- 
GNU C Library master sources


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