2 simple changes,

1 - the gdb-invoked tests we're sometimes getting enough text that it would interactively ask for
   ---Type <return> to continue, or q <return> to quit---
which would either cause a hang/timeout while it waited and/or failure.
Fixed by adding 'set height 0' in the script

2 - sync-mem-invalid.c still had tests for __sync_mem_compare_exchange which no longer exists. so removed them

checked in as obvious.

Andrew
        * gcc.dg/sync-mem-invalid.c: Remove __sync_mem_compare_exchange test.
        * gcc.dg/memmodel/memmodel.gdb: Avoid pagination.
  
Index: gcc.dg/sync-mem-invalid.c
===================================================================
*** gcc.dg/sync-mem-invalid.c   (revision 177737)
--- gcc.dg/sync-mem-invalid.c   (working copy)
*************** main ()
*** 9,19 ****
  {
    __sync_mem_exchange (&i, 1, __SYNC_MEM_CONSUME); /* { dg-error "invalid 
memory model" } */
  
-   __sync_mem_compare_exchange (&i, 1, 2, __SYNC_MEM_SEQ_CST, 
__SYNC_MEM_RELEASE); /* { dg-error "invalid failure memory model" } */
-   __sync_mem_compare_exchange (&i, 1, 2, __SYNC_MEM_SEQ_CST, 
__SYNC_MEM_ACQ_REL); /* { dg-error "invalid failure memory model" } */
-   __sync_mem_compare_exchange (&i, 1, 2, __SYNC_MEM_ACQUIRE, 
__SYNC_MEM_SEQ_CST); /* { dg-error "failure memory model" } */
-   __sync_mem_compare_exchange (&i, 1, 2, __SYNC_MEM_RELAXED, 
__SYNC_MEM_ACQUIRE); /* { dg-error "failure memory model" } */
- 
    __sync_mem_load (&i, __SYNC_MEM_RELEASE); /* { dg-error "invalid memory 
model" } */
    __sync_mem_load (&i, __SYNC_MEM_ACQ_REL); /* { dg-error "invalid memory 
model" } */
  
--- 9,14 ----
Index: gcc.dg/memmodel/memmodel.gdb
===================================================================
*** gcc.dg/memmodel/memmodel.gdb        (revision 177737)
--- gcc.dg/memmodel/memmodel.gdb        (working copy)
***************
*** 1,3 ****
--- 1,4 ----
+ set height 0
  break main
  disp/i $pc
  run

Reply via email to