summary refs log tree commit diff
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2017-05-25 14:53:40 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2017-05-25 14:53:40 -0300
commit6e75b0110d39be39131e9b458c256521df1eb657 (patch)
tree778f735d19300713a4827b751a002d51f555af1d
parent81efada5287c3215307623e57d3bbbeefa0c1250 (diff)
downloadglibc-6e75b0110d39be39131e9b458c256521df1eb657.tar.gz
glibc-6e75b0110d39be39131e9b458c256521df1eb657.tar.xz
glibc-6e75b0110d39be39131e9b458c256521df1eb657.zip
Move tst-mutex*8* to tests-internal
The following tests depend on ENABLE_LOCK_ELISION, which is only
available on tests-internal.

 - nptl/tst-mutex8
 - nptl/tst-mutex8-static
 - nptl/tst-mutexpi8
 - nptl/tst-mutexpi8-static

	* nptl/Makefile (tests): Move nptl/tst-mutex8, nptl/tst-mutex8-static,
	nptl/tst-mutexpi8 and nptl/tst-mutexpi8-static to...
	(tests-internal): ... here.
-rw-r--r--ChangeLog6
-rw-r--r--nptl/Makefile9
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index baf21026c3..dd814acd4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-25  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
+
+	* nptl/Makefile (tests): Move nptl/tst-mutex8, nptl/tst-mutex8-static,
+	nptl/tst-mutexpi8 and nptl/tst-mutexpi8-static to...
+	(tests-internal): ... here.
+
 2017-05-25   Siddhesh Poyarekar  <siddhesh@sourceware.org>
 	     H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/nptl/Makefile b/nptl/Makefile
index eeadf4c425..853da72e74 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -230,9 +230,9 @@ LDLIBS-tst-thread_local1 = -lstdc++
 
 tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
 	tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
-	tst-mutex7 tst-mutex8 tst-mutex9 tst-mutex5a tst-mutex7a \
+	tst-mutex7 tst-mutex9 tst-mutex5a tst-mutex7a \
 	tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 tst-mutexpi5 \
-	tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a tst-mutexpi8 \
+	tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \
 	tst-mutexpi9 \
 	tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
 	tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
@@ -305,7 +305,8 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
 	tst-robust-fork tst-create-detached
 
 tests-internal := tst-typesizes tst-rwlock19 tst-sem11 tst-sem12 tst-sem13 \
-		  tst-barrier5 tst-signal7
+		  tst-barrier5 tst-signal7 tst-mutex8 tst-mutex8-static \
+		  tst-mutexpi8 tst-mutexpi8-static
 
 xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
 	tst-mutexpp1 tst-mutexpp6 tst-mutexpp10
@@ -433,7 +434,7 @@ tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \
 		tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
 		tst-sem12-static
 tests += tst-cancel21-static tst-cancel24-static \
-	 tst-cond8-static tst-mutex8-static tst-mutexpi8-static
+	 tst-cond8-static
 tests-internal += tst-sem11-static tst-sem12-static tst-stackguard1-static
 xtests-static += tst-setuid1-static