Skip to content

restored test/debugger-mi #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paolopas wants to merge 1 commit into from
Closed

restored test/debugger-mi #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/engine/debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ static const char * debug_format_message( const char * format, va_list vargs )
#endif
va_end( args );
if ( 0 <= result && result < sz )
return buf;
return buf;
free( buf );
if ( result < 0 )
return 0;
Expand Down Expand Up @@ -1153,7 +1153,7 @@ static void debug_start_child( int argc, const char * * argv )
string_append( command_line, debugger_opt );
string_append( command_line, b2::value::format( "=%p", pipe2[ 1 ] )->str() );
/* Pass the rest of the command line. */
{
{
int i;
for ( i = 1; i < argc; ++i )
{
Expand Down Expand Up @@ -1628,7 +1628,7 @@ static const char * const help_text[][2] =
{
"break",
"break <location>\n"
"Sets a breakpoint at <location>. <location> can be either a the name of a\nfunction or <filename>:<lineno>\n"
"Sets a breakpoint at <location>. <location> can be either the name of a\nfunction or <filename>:<lineno>\n"
},
{
"disable",
Expand Down
110 changes: 55 additions & 55 deletions test/debugger-mi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ def test_exec_run():

run(t, """\
=thread-group-added,id="i1"
(gdb)
(gdb)
72-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
72^running
(gdb)
(gdb)
*stopped,reason="exited-normally"
(gdb)
(gdb)
73-gdb-exit
73^exit
""")
Expand All @@ -63,14 +63,14 @@ def test_exit_status():
""")
run(t, """\
=thread-group-added,id="i1"
(gdb)
(gdb)
72-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
72^running
(gdb)
(gdb)

*stopped,reason="exited",exit-code="1"
(gdb)
(gdb)
73-gdb-exit
73^exit
""")
Expand All @@ -93,31 +93,31 @@ def test_exec_step():
""")
run(t, """\
=thread-group-added,id="i1"
(gdb)
(gdb)
-break-insert f
^done,bkpt={number="1",type="breakpoint",disp="keep",enabled="y",func="f"}
(gdb)
(gdb)
72-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
72^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="1",disp="keep",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="8"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
1-exec-step
1^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="g",args=[],file="test.jam",fullname="{{.*}}test.jam",line="3"},thread-id="1"
(gdb)
(gdb)
2-exec-step
2^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="g",args=[],file="test.jam",fullname="{{.*}}test.jam",line="4"},thread-id="1"
(gdb)
(gdb)
3-exec-step
3^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="9"},thread-id="1"
(gdb)
(gdb)
73-gdb-exit
73^exit
""")
Expand Down Expand Up @@ -146,36 +146,36 @@ def test_exec_next():
""")
run(t, """\
=thread-group-added,id="i1"
(gdb)
(gdb)
-break-insert f
^done,bkpt={number="1",type="breakpoint",disp="keep",enabled="y",func="f"}
(gdb)
(gdb)
72-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
72^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="1",disp="keep",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="7"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
1-exec-next
1^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="8"},thread-id="1"
(gdb)
(gdb)
2-exec-next
2^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="9"},thread-id="1"
(gdb)
(gdb)
3-exec-next
3^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="h",args=[],file="test.jam",fullname="{{.*}}test.jam",line="14"},thread-id="1"
(gdb)
(gdb)
4-exec-next
4^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="module scope",args=[],file="test.jam",fullname="{{.*}}test.jam",line="17"},thread-id="1"
(gdb)
(gdb)
73-gdb-exit
73^exit
""")
Expand Down Expand Up @@ -208,31 +208,31 @@ def test_exec_finish():
""")
run(t, """\
=thread-group-added,id="i1"
(gdb)
(gdb)
-break-insert f
^done,bkpt={number="1",type="breakpoint",disp="keep",enabled="y",func="f"}
(gdb)
(gdb)
72-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
72^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="1",disp="keep",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="3"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
1-exec-finish
1^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="g",args=[],file="test.jam",fullname="{{.*}}test.jam",line="8"},thread-id="1"
(gdb)
(gdb)
2-exec-finish
2^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="h",args=[],file="test.jam",fullname="{{.*}}test.jam",line="14"},thread-id="1"
(gdb)
(gdb)
3-exec-finish
3^running
(gdb)
(gdb)
*stopped,reason="end-stepping-range",frame={func="module scope",args=[],file="test.jam",fullname="{{.*}}test.jam",line="21"},thread-id="1"
(gdb)
(gdb)
73-gdb-exit
73^exit
""")
Expand Down Expand Up @@ -264,55 +264,55 @@ def test_breakpoints():
""")
run(t, """\
=thread-group-added,id="i1"
(gdb)
(gdb)
-break-insert f
^done,bkpt={number="1",type="breakpoint",disp="keep",enabled="y",func="f"}
(gdb)
(gdb)
72-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
72^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="1",disp="keep",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="3"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
-interpreter-exec console kill
^done
(gdb)
(gdb)
-break-insert g
^done,bkpt={number="2",type="breakpoint",disp="keep",enabled="y",func="g"}
(gdb)
(gdb)
-break-disable 1
^done
(gdb)
(gdb)
73-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
73^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="2",disp="keep",frame={func="g",args=[],file="test.jam",fullname="{{.*}}test.jam",line="7"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
-interpreter-exec console kill
^done
(gdb)
(gdb)
-break-enable 1
^done
(gdb)
(gdb)
74-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
74^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="1",disp="keep",frame={func="f",args=[],file="test.jam",fullname="{{.*}}test.jam",line="3"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
-interpreter-exec console kill
^done
(gdb)
(gdb)
-break-delete 1
^done
(gdb)
(gdb)
75-exec-run -ftest.jam
=thread-created,id="1",group-id="i1"
75^running
(gdb)
(gdb)
*stopped,reason="breakpoint-hit",bkptno="2",disp="keep",frame={func="g",args=[],file="test.jam",fullname="{{.*}}test.jam",line="7"},thread-id="1",stopped-threads="all"
(gdb)
(gdb)
76-gdb-exit
76^exit
""")
Expand Down
3 changes: 1 addition & 2 deletions test/test_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,7 @@ def reorder_tests(tests, first_test):
"core_variables_in_actions",
"custom_generator",
"debugger",
# Newly broken?
# "debugger-mi",
"debugger-mi",
"default_build",
"default_features",
"default_toolset",
Expand Down
Loading