On Wed, Feb 08, 2012 at 11:02:02AM -0500, Andrew MacLeod wrote:
> On 02/08/2012 09:47 AM, Andrew MacLeod wrote:
>>
>> I propose increasing the time to 20 seconds and reduce the log file.
>> I believe the timeout as made really short because of the size of the
>> log file when the timeout was needed. I htink it was an arbitrary
>> number. Doubling the execution time and halving the size of the log
>> file should put us about where we were.
>>
>> Im even fine abandoning most of the log file if need be as well... Its
>> really pass or fail that I care about and a fail usually requires hand
>> investigation anyway
>>
>> The other thing we can do is to only run the test with -O0 and -O3.
>> right now they run with -O0, -O1, -O2, -O3, -Os. I don't think the
>> other options really add much.
>>
> So something like the following changes:
>
>
> I'm running a testsuite run on x86-64 right now, I'll try arm as well
> shortly. Presuming that it runs properly, is this OK for mainline?
Andrew,
I can confirm that this eliminates the unexpected failures in
simulate-thread.exp on x86_64-apple-darwin11...
Native configuration is x86_64-apple-darwin11.3.0
=== gcc tests ===
Running target unix/-m32
=== gcc Summary for unix/-m32 ===
# of expected passes 49
# of unsupported tests 7
Running target unix/-m64
=== gcc Summary for unix/-m64 ===
# of expected passes 57
# of unsupported tests 3
=== gcc Summary ===
# of expected passes 106
# of unsupported tests 10
/sw/src/fink.build/gcc47-4.7.0-1/darwin_objdir/gcc/xgcc version 4.7.0 20120208
(experimental) (GCC)
Compiler version: 4.7.0 20120208 (experimental) (GCC)
Platform: x86_64-apple-darwin11.3.0
configure flags: --prefix=/sw --prefix=/sw/lib/gcc4.7 --mandir=/sw/share/man
--infodir=/sw/lib/gcc4.7/info --with-build-config=bootstrap-lto
--enable-stage1-languages=c,lto
--enable-languages=c,c++,fortran,lto,objc,obj-c++,java --with-gmp=/sw
--with-libiconv-prefix=/sw --with-ppl=/sw --with-cloog=/sw --with-mpc=/sw
--with-system-zlib --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--program-suffix=-fsf-4.7 --enable-checking=release --enable-cloog-backend=isl
Thanks for the fix.
Jack
>
> Andrew
>
> 2012-02-08 Jack Howarth <[email protected]>
>
> * lib/gcc-simulate-thread.exp (simulate-thread): Increase timeout
> to 20 seconds.
>
> 2012-02-08 Andrew MacLeod <[email protected]>
>
> * gcc.dg/simulate-thread/simulate-thread.exp: Use only -O0 and -O3.
> * gcc.dg/simulate-thread/simulate-thread.gdb: Don't display every
> machine instuction in the log.
>
> Index: lib/gcc-simulate-thread.exp
> ===================================================================
> *** lib/gcc-simulate-thread.exp (revision 183969)
> --- lib/gcc-simulate-thread.exp (working copy)
> *************** proc simulate-thread { args } {
> *** 56,63 ****
>
> set gdb_worked 0
>
> ! # Set timeout to 10 seconds due to huge amount of generated log.
> ! remote_expect target 10 {
> # Too old GDB
> -re "Unhandled dwarf expression|Error in sourced command file" {
> unsupported "$testcase $message"
> --- 56,63 ----
>
> set gdb_worked 0
>
> ! # Set timeout to 20 seconds due to huge amount of generated log.
> ! remote_expect target 20 {
> # Too old GDB
> -re "Unhandled dwarf expression|Error in sourced command file" {
> unsupported "$testcase $message"
> Index: gcc.dg/simulate-thread/simulate-thread.exp
> ===================================================================
> *** gcc.dg/simulate-thread/simulate-thread.exp (revision 183969)
> --- gcc.dg/simulate-thread/simulate-thread.exp (working copy)
> *************** dg-init
> *** 24,33 ****
> torture-init
> set-torture-options [list \
> { -O0 -g } \
> ! { -O1 -g } \
> ! { -O2 -g } \
> ! { -O3 -g } \
> ! { -Os -g } ]
>
> if [gdb-exists] {
> gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] ""
> --- 24,30 ----
> torture-init
> set-torture-options [list \
> { -O0 -g } \
> ! { -O3 -g } ]
>
> if [gdb-exists] {
> gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] ""
> Index: gcc.dg/simulate-thread/simulate-thread.gdb
> ===================================================================
> *** gcc.dg/simulate-thread/simulate-thread.gdb (revision 183969)
> --- gcc.dg/simulate-thread/simulate-thread.gdb (working copy)
> ***************
> *** 1,6 ****
> set height 0
> break simulate_thread_main
> ! disp/i $pc
> run
>
> set $ret = 0
> --- 1,6 ----
> set height 0
> break simulate_thread_main
> ! # disp/i $pc
> run
>
> set $ret = 0
