2006-11-23 Nathan Sidwell * gdb.trace/save-trace.exp, gdb.trace/collection.exp, gdb.trace/while-stepping.exp, gdb.trace/while-dyn.exp, gdb.trace/actions.exp, gdb.trace/limits.exp, gdb.trace/passc-dyn.exp, gdb.trace/tfind.exp, gdb.trace/packetlen.exp, gdb.trace/infotrace.exp, gdb.trace/report.exp, gdb.trace/passcount.exp, gdb.trace/backtrace.exp, gdb.trace/circ.exp, gdb.trace/tracecmd.exp, gdb.trace/deltrace.exp: Disable m68k-elf specific expectations. Remove unterminated strings used as comments. Index: gdb/testsuite/gdb.trace/save-trace.exp =================================================================== --- gdb/testsuite/gdb.trace/save-trace.exp (revision 155657) +++ gdb/testsuite/gdb.trace/save-trace.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; } else { Index: gdb/testsuite/gdb.trace/collection.exp =================================================================== --- gdb/testsuite/gdb.trace/collection.exp (revision 155657) +++ gdb/testsuite/gdb.trace/collection.exp (working copy) @@ -17,7 +17,7 @@ # Please email any bugs, comments, and/or additions to this file to: # bug-gdb@prep.ai.mit.edu -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { pass "Test not supported on this target" return; } Index: gdb/testsuite/gdb.trace/while-stepping.exp =================================================================== --- gdb/testsuite/gdb.trace/while-stepping.exp (revision 155657) +++ gdb/testsuite/gdb.trace/while-stepping.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; } else { Index: gdb/testsuite/gdb.trace/actions.exp =================================================================== --- gdb/testsuite/gdb.trace/actions.exp (revision 155657) +++ gdb/testsuite/gdb.trace/actions.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set binfile [board_info target d490_binfile]; set srcfile gdb_c_test.c } else { Index: gdb/testsuite/gdb.trace/while-dyn.exp =================================================================== --- gdb/testsuite/gdb.trace/while-dyn.exp (revision 155657) +++ gdb/testsuite/gdb.trace/while-dyn.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { load_lib "emc-support.exp" set testfile "gdb_c_test" set srcfile $testfile.c @@ -47,7 +47,6 @@ if [istarget "m68k-*-elf"] then { -re "MIS-MATCHED.*$gdb_prompt $" { untested while-dyn.exp return -1 - all tests in this module will fail."; } -re ".*$gdb_prompt $" { } } @@ -99,7 +98,7 @@ gdb_trace_setactions "5.12: define while gdb_test "tstart" "" "" -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { gdb_emclaptop_command "85,1,2,3,4,5,6" sleep 5 } else { Index: gdb/testsuite/gdb.trace/passc-dyn.exp =================================================================== --- gdb/testsuite/gdb.trace/passc-dyn.exp (revision 155657) +++ gdb/testsuite/gdb.trace/passc-dyn.exp (working copy) @@ -30,7 +30,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { load_lib "emc-support.exp"; set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; @@ -45,7 +45,6 @@ if [istarget "m68k-*-elf"] then { -re "MIS-MATCHED.*$gdb_prompt $" { untested passc-dyn.exp return -1 - all tests in this module will fail."; } -re ".*$gdb_prompt $" { } } @@ -121,7 +120,7 @@ gdb_test "passcount 3 $tdp4" "Setting tr gdb_test "tstart" "" "" -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { gdb_emclaptop_command "85,1,2,3,4,5,6" sleep 5 gdb_emclaptop_command "85,7,8,9,A,B,C" Index: gdb/testsuite/gdb.trace/limits.exp =================================================================== --- gdb/testsuite/gdb.trace/limits.exp (revision 155657) +++ gdb/testsuite/gdb.trace/limits.exp (working copy) @@ -17,7 +17,7 @@ # Please email any bugs, comments, and/or additions to this file to: # bug-gdb@prep.ai.mit.edu -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { pass "Test not supported on this target" return; } Index: gdb/testsuite/gdb.trace/tfind.exp =================================================================== --- gdb/testsuite/gdb.trace/tfind.exp (revision 155657) +++ gdb/testsuite/gdb.trace/tfind.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { load_lib "emc-support.exp"; set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; @@ -46,7 +46,6 @@ if [istarget "m68k-*-elf"] then { -re "MIS-MATCHED.*$gdb_prompt $" { untested tfind.exp return -1 - all tests in this module will fail."; } -re ".*$gdb_prompt $" { } } @@ -138,7 +137,7 @@ gdb_test "tstatus" "\[Tt\]race is runnin # 6.2 test help tstart gdb_test "help tstart" "Start trace data collection." "6.2: help tstart" -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { gdb_emclaptop_command "85,1,2,3,4,5,6" sleep 5 Index: gdb/testsuite/gdb.trace/packetlen.exp =================================================================== --- gdb/testsuite/gdb.trace/packetlen.exp (revision 155657) +++ gdb/testsuite/gdb.trace/packetlen.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { load_lib "emc-support.exp" set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; @@ -46,7 +46,6 @@ if [istarget "m68k-*-elf"] then { -re "MIS-MATCHED.*$gdb_prompt $" { untested packetlen.exp return -1 - all tests in this module will fail."; } -re ".*$gdb_prompt $" { } } @@ -88,7 +87,7 @@ gdb_trace_setactions "setup collect acti "end" "" gdb_test "tstart" "" "survive the long packet send" -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { gdb_emclaptop_command "85,1,2,3,4,5,6" sleep 5 } else { Index: gdb/testsuite/gdb.trace/infotrace.exp =================================================================== --- gdb/testsuite/gdb.trace/infotrace.exp (revision 155657) +++ gdb/testsuite/gdb.trace/infotrace.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; } else { Index: gdb/testsuite/gdb.trace/report.exp =================================================================== --- gdb/testsuite/gdb.trace/report.exp (revision 155657) +++ gdb/testsuite/gdb.trace/report.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { load_lib "emc-support.exp"; set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; @@ -46,7 +46,6 @@ if [istarget "m68k-*-elf"] then { -re "MIS-MATCHED.*$gdb_prompt $" { untested report.exp return -1 - all tests in this module will fail."; } -re ".*$gdb_prompt $" { } } @@ -133,13 +132,11 @@ gdb_expect { if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } { untested report.exp return -1 -all tests in this module will fail." } } default { untested report.exp return -1 -all tests in this module will fail." } } @@ -190,7 +187,7 @@ gdb_trace_setactions "9.x: setup TP to c gdb_test "tstart" "" "" -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { gdb_emclaptop_command "85,$arg1,$arg2,$arg3,$arg4,$arg5,$arg6" sleep 5 Index: gdb/testsuite/gdb.trace/passcount.exp =================================================================== --- gdb/testsuite/gdb.trace/passcount.exp (revision 155657) +++ gdb/testsuite/gdb.trace/passcount.exp (working copy) @@ -30,7 +30,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; } else { Index: gdb/testsuite/gdb.trace/backtrace.exp =================================================================== --- gdb/testsuite/gdb.trace/backtrace.exp (revision 155657) +++ gdb/testsuite/gdb.trace/backtrace.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { load_lib "emc-support.exp"; set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; @@ -46,7 +46,6 @@ if [istarget "m68k-*-elf"] then { -re "MIS-MATCHED.*$gdb_prompt $" { untested backtrace.exp return -1 - all tests in this module will fail."; } -re ".*$gdb_prompt $" { } } @@ -177,7 +176,7 @@ gdb_trace_setactions "8.6: setup TP to c gdb_test "tstart" "" "" -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { gdb_emclaptop_command "85,$arg1,$arg2,$arg3,$arg4,$arg5,$arg6" sleep 5 } else { Index: gdb/testsuite/gdb.trace/circ.exp =================================================================== --- gdb/testsuite/gdb.trace/circ.exp (revision 155657) +++ gdb/testsuite/gdb.trace/circ.exp (working copy) @@ -17,7 +17,7 @@ # Please email any bugs, comments, and/or additions to this file to: # bug-gdb@prep.ai.mit.edu -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { pass "Test not supported on this target" return; } Index: gdb/testsuite/gdb.trace/tracecmd.exp =================================================================== --- gdb/testsuite/gdb.trace/tracecmd.exp (revision 155657) +++ gdb/testsuite/gdb.trace/tracecmd.exp (working copy) @@ -30,7 +30,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; } else { Index: gdb/testsuite/gdb.trace/deltrace.exp =================================================================== --- gdb/testsuite/gdb.trace/deltrace.exp (revision 155657) +++ gdb/testsuite/gdb.trace/deltrace.exp (working copy) @@ -31,7 +31,7 @@ set bug_id 0 gdb_exit gdb_start -if [istarget "m68k-*-elf"] then { +if { 0 && [istarget "m68k-*-elf"] } then { set srcfile gdb_c_test.c set binfile [board_info target d490_binfile]; } else {