[PATCH 05/24] Don't rely on inferior I/O in {call-signal-resume, unwindonsignal}.exp

Pedro Alves
2015-04-21T18:08:43Z

These tests rely on inferior I/O, but that seems pointless and
unrelated here. Simply remove the printf calls, and don't expect
them.

gdb/testsuite/ChangeLog:
2015-04-21 Pedro Alves <palves@redhat.com>

* gdb.base/call-signal-resume.exp: Remove check for
gdb,noinferiorio. Don't expect "no signal". Use gdb_test.
* gdb.base/unwindonsignal.exp: Likewise.
* gdb.base/call-signals.c (gen_signal): Remove printf call.
* gdb.base/unwindonsignal.c (gen_signal): Likewise.
---
gdb/testsuite/gdb.base/call-signal-resume.exp | 18 ++++--------------
gdb/testsuite/gdb.base/call-signals.c | 3 ---
gdb/testsuite/gdb.base/unwindonsignal.c | 3 ---
gdb/testsuite/gdb.base/unwindonsignal.exp | 18 ++++--------------
4 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index a4e6bd0..a8b0585 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -20,11 +20,6 @@
# 2) Inferior is stopped at a signal. Upon resumption it should continue
# with that signal, regardless of whatever the hand-called function did.

-if [target_info exists gdb,noinferiorio] {
- verbose "Skipping call-signal-resume.exp because of no fileio capabilities."
- continue
-}
-
if [target_info exists gdb,nosignals] {
verbose "Skipping call-signal-resume.exp because of nosignals."
continue
@@ -72,15 +67,10 @@ gdb_test "continue" "Continuing.*Breakpoint \[0-9\]*, stop_one.*" \

# Call function (causing the program to get a signal), and see if gdb handles
# it properly.
-gdb_test_multiple "call gen_signal ()" \
- "inferior function call signaled" {
- -re "\[\r\n\]*no signal\[\r\n\]+$gdb_prompt $" {
- unsupported "inferior function call signaled"
- return 0
- }
- -re "\[\r\n\]*The program being debugged was signaled.*\[\r\n\]+$gdb_prompt $" {
- pass "inferior function call signaled"
- }
+if {[gdb_test "call gen_signal ()" \
+ "\[\r\n\]*The program being debugged was signaled.*" \
+ "inferior function call signaled"] != 0} {
+ return 0
}

set frame_number [get_dummy_frame_number]
diff --git a/gdb/testsuite/gdb.base/call-signals.c b/gdb/testsuite/gdb.base/call-signals.c
index 2c5b770..c166649 100644
--- a/gdb/testsuite/gdb.base/call-signals.c
+++ b/gdb/testsuite/gdb.base/call-signals.c
@@ -18,7 +18,6 @@
/* Support program for testing handling of inferior function calls
in the presence of signals. */

-#include <stdio.h>
#include <signal.h>
#include <unistd.h>

@@ -32,8 +31,6 @@ gen_signal ()
{
/* According to sigall.exp, SIGABRT is always supported. */
kill (getpid (), SIGABRT);
- /* If we get here we couldn't generate a signal, tell dejagnu. */
- printf ("no signal\n");
}

/* Easy place to set a breakpoint. */
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.c b/gdb/testsuite/gdb.base/unwindonsignal.c
index 92d8ba4..e1b2094 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.c
+++ b/gdb/testsuite/gdb.base/unwindonsignal.c
@@ -17,7 +17,6 @@

/* Support program for testing unwindonsignal. */

-#include <stdio.h>
#include <signal.h>
#include <unistd.h>

@@ -26,8 +25,6 @@ gen_signal ()
{
/* According to sigall.exp, SIGABRT is always supported. */
kill (getpid (), SIGABRT);
- /* If we get here we couldn't generate a signal, tell dejagnu. */
- printf ("no signal\n");
}

/* Easy place to set a breakpoint. */
diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp
index 2014e8d..dd53cfe 100644
--- a/gdb/testsuite/gdb.base/unwindonsignal.exp
+++ b/gdb/testsuite/gdb.base/unwindonsignal.exp
@@ -13,11 +13,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-if [target_info exists gdb,noinferiorio] {
- verbose "Skipping unwindonsignal.exp because of no fileio capabilities."
- continue
-}
-
if [target_info exists gdb,nosignals] {
verbose "Skipping unwindonsignal.exp because of nosignals."
continue
@@ -58,15 +53,10 @@ gdb_test "show unwindonsignal" \

# Call function (causing the program to get a signal), and see if gdb handles
# it properly.
-gdb_test_multiple "call gen_signal ()" \
- "unwindonsignal, inferior function call signaled" {
- -re "\[\r\n\]*no signal\[\r\n\]+$gdb_prompt $" {
- unsupported "unwindonsignal, inferior function call signaled"
- return 0
- }
- -re "\[\r\n\]*The program being debugged was signaled.*\[\r\n\]+$gdb_prompt $" {
- pass "unwindonsignal, inferior function call signaled"
- }
+if {[gdb_test "call gen_signal ()" \
+ "\[\r\n\]*The program being debugged was signaled.*" \
+ "unwindonsignal, inferior function call signaled"] != 0} {
+ return 0
}

# Verify the stack got unwound.
--
1.9.3