Move tst-mutex*8* to tests-internal

Message ID 1494857858-3137-1-git-send-email-tuliom@linux.vnet.ibm.com
State Committed
Headers

Commit Message

Tulio Magno Quites Machado Filho May 15, 2017, 2:17 p.m. UTC
  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

2017-05-15  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.
---
 nptl/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
  

Comments

Zack Weinberg May 20, 2017, 1:06 p.m. UTC | #1
On 05/15/2017 10:17 AM, Tulio Magno Quites Machado Filho wrote:
> 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
> 
> 2017-05-15  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.

OK.

zw
  
Stefan Liebler May 22, 2017, 2:21 p.m. UTC | #2
On 05/20/2017 03:06 PM, Zack Weinberg wrote:
> On 05/15/2017 10:17 AM, Tulio Magno Quites Machado Filho wrote:
>> 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
>>
>> 2017-05-15  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.
>
> OK.
>
> zw
>

This solves the failing nptl/tst-mutex8* testcases if lock elision is 
enabled on s390x, too.

Tulio, can you commit your patch?

Bye
Stefan
  
Tulio Magno Quites Machado Filho May 25, 2017, 5:55 p.m. UTC | #3
Stefan Liebler <stli@linux.vnet.ibm.com> writes:

> On 05/20/2017 03:06 PM, Zack Weinberg wrote:
>> On 05/15/2017 10:17 AM, Tulio Magno Quites Machado Filho wrote:
>>> 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
>>>
>>> 2017-05-15  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.
>>
>> OK.
>>
>> zw
>>
>
> This solves the failing nptl/tst-mutex8* testcases if lock elision is 
> enabled on s390x, too.
>
> Tulio, can you commit your patch?

Pushed as 6e75b0110d.
  

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index d39bb50..6bd5da6 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -225,9 +225,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 \
@@ -300,7 +300,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
@@ -428,7 +429,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