From 2580417f09953db3ceb3fd3f50b7d49994bcefeb Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Fri, 14 Nov 2008 06:55:40 +0000 Subject: [PATCH] (set_lang_c): Delete. (runto_main): If it fails, call fail instead of gdb_suppress_tests. --- gdb/testsuite/gdb.base/callexit.exp | 38 +++-------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp index 6d4149be3f9..a794b83becc 100644 --- a/gdb/testsuite/gdb.base/callexit.exp +++ b/gdb/testsuite/gdb.base/callexit.exp @@ -37,35 +37,6 @@ if [target_info exists gdb,cannot_call_functions] { continue } -# Set the current language to C. This counts as a test. If it -# fails, then we skip the other tests. - -proc set_lang_c {} { - global gdb_prompt - - send_gdb "set language c\n" - gdb_expect { - -re ".*$gdb_prompt $" {} - timeout { fail "set language c (timeout)" ; return 0; } - } - - send_gdb "show language\n" - gdb_expect { - -re ".* source language is \"c\".*$gdb_prompt $" { - pass "set language to \"c\"" - return 1 - } - -re ".*$gdb_prompt $" { - fail "setting language to \"c\"" - return 0 - } - timeout { - fail "can't show language (timeout)" - return 0 - } - } -} - # Start with a fresh gdb. gdb_exit @@ -73,12 +44,9 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -if { ![set_lang_c] } { - gdb_suppress_tests; -} else { - if { ![runto_main] } { - gdb_suppress_tests; - } +if { ![runto_main] } { + fail "Can't run to main" + return 0 } # Call function (causing the program to exit), and see if gdb handles