From f6a9d9c7db9b6b58e6915869c1bd7c83d96d31ee Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 6 Aug 2015 12:45:45 +0100 Subject: [PATCH] Revert "test slowdown" That was pushed by mistake. --- gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c | 4 ++-- gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c index 14b42405fcc..a6ff0fd3d07 100644 --- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c +++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c @@ -33,7 +33,7 @@ pthread_t threads[NTHREADS]; pthread_barrier_t barrier; -#define NFORKS 1000 +#define NFORKS 10 /* Used to create a conditional breakpoint that always fails. */ volatile int zero; @@ -108,7 +108,7 @@ main (void) pthread_t bp_thread; /* Don't run forever. */ - // alarm (180); + alarm (180); pthread_barrier_init (&barrier, NULL, NTHREADS + 1); diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp index b50e6ec7b27..448b734fd53 100644 --- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp +++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp @@ -39,7 +39,6 @@ proc do_test { cond_bp_target detach_on_fork } { set saved_gdbflags $GDBFLAGS set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""] - set GDBFLAGS [concat $GDBFLAGS " -ex \"set sysroot /\""] clean_restart $binfile set GDBFLAGS $saved_gdbflags @@ -72,7 +71,6 @@ proc do_test { cond_bp_target detach_on_fork } { } -re "Inferior $decimal \(\[^\r\n\]+\) exited normally" { incr fork_count - exp_continue if {$fork_count <= 100} { exp_continue } else { @@ -107,7 +105,7 @@ proc foreach_with_prefix {var list body} { } foreach_with_prefix cond_bp_target {1 0} { - foreach_with_prefix detach_on_fork {"off" "off"} { + foreach_with_prefix detach_on_fork {"on" "off"} { do_test $cond_bp_target $detach_on_fork # Disable "off" for now. The test does pass with -- 2.30.2