about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-27 21:48:34 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-10-27 21:48:34 +0000
commit678443ce179c30305be3a4a042abad2912c863d8 (patch)
tree2ddea7fab8ca07d0cf493667b2fead7de7b0b99e
parent783dd2d3af5aad76829e61ab5abeac5d466971f6 (diff)
downloadglibc-678443ce179c30305be3a4a042abad2912c863d8.tar.gz
glibc-678443ce179c30305be3a4a042abad2912c863d8.tar.xz
glibc-678443ce179c30305be3a4a042abad2912c863d8.zip
Add -std=gnu11 and -std=c11 NPTL initializers tests.
NPTL has tests that initializers work with various -std= options.  Now
that we can rely on -std=gnu11 and -std=c11 being available, this
patch adds versions of those tests for those options.

Tested for x86_64 and x86 (testsuite).

	* nptl/tst-initializers1-c11.c: New file.
	* nptl/tst-initializers1-gnu11.c: Likewise.
	* nptl/Makefile (tests): Add these new tests.
	(CFLAGS-tst-initializers1-c11.c): New variable.
	(CFLAGS-tst-initializers1-gnu11.c): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--nptl/Makefile5
-rw-r--r--nptl/tst-initializers1-c11.c1
-rw-r--r--nptl/tst-initializers1-gnu11.c1
4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54471b2423..c6404a6ef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-27  Joseph Myers  <joseph@codesourcery.com>
 
+	* nptl/tst-initializers1-c11.c: New file.
+	* nptl/tst-initializers1-gnu11.c: Likewise.
+	* nptl/Makefile (tests): Add these new tests.
+	(CFLAGS-tst-initializers1-c11.c): New variable.
+	(CFLAGS-tst-initializers1-gnu11.c): Likewise.
+
 	* Makeconfig (CFLAGS): Use -std=gnu11 instead of -std=gnu99.
 	* Makefile ($(objpfx)c++-types-check.out): Filter out -std=gnu11
 	instead of -std=gnu99.
diff --git a/nptl/Makefile b/nptl/Makefile
index 7b816a3e2d..9ad8793afc 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -285,7 +285,8 @@ tests = tst-typesizes \
 	tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
 	tst-getpid3 \
 	tst-setuid3 \
-	tst-initializers1 $(addprefix tst-initializers1-,c89 gnu89 c99 gnu99) \
+	tst-initializers1 $(addprefix tst-initializers1-,\
+			    c89 gnu89 c99 gnu99 c11 gnu11) \
 	tst-bad-schedattr \
 	tst-thread_local1
 xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
@@ -483,8 +484,10 @@ CFLAGS-tst-initializers1-< = $(CFLAGS-tst-initializers1.c) \
 			     $(patsubst tst-initializers1-%.c,-std=%,$<)
 CFLAGS-tst-initializers1-c89.c = $(CFLAGS-tst-initializers1-<)
 CFLAGS-tst-initializers1-c99.c = $(CFLAGS-tst-initializers1-<)
+CFLAGS-tst-initializers1-c11.c = $(CFLAGS-tst-initializers1-<)
 CFLAGS-tst-initializers1-gnu89.c = $(CFLAGS-tst-initializers1-<)
 CFLAGS-tst-initializers1-gnu99.c = $(CFLAGS-tst-initializers1-<)
+CFLAGS-tst-initializers1-gnu11.c = $(CFLAGS-tst-initializers1-<)
 
 tst-cancel7-ARGS = --command "exec $(host-test-program-cmd)"
 tst-cancelx7-ARGS = $(tst-cancel7-ARGS)
diff --git a/nptl/tst-initializers1-c11.c b/nptl/tst-initializers1-c11.c
new file mode 100644
index 0000000000..7c27c1d545
--- /dev/null
+++ b/nptl/tst-initializers1-c11.c
@@ -0,0 +1 @@
+#include "tst-initializers1.c"
diff --git a/nptl/tst-initializers1-gnu11.c b/nptl/tst-initializers1-gnu11.c
new file mode 100644
index 0000000000..7c27c1d545
--- /dev/null
+++ b/nptl/tst-initializers1-gnu11.c
@@ -0,0 +1 @@
+#include "tst-initializers1.c"