3 files changed, 0 insertions, 152 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f0bcbf8..db5127c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,11 +1,3 @@
-2014-12-02  Nick Bull  <nicholaspbull@gmail.com>
-
-	* gdb.python/py-events.py (inferior_call_handler): New.
-	(register_changed_handler, memory_changed_handler): New.
-	(test_events.invoke): Register new handlers.
-	* gdb.python/py-events.exp: Add tests for inferior call,
-	memory_changed and register_changed events.
-
 2014-12-02  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* gdb.base/execl-update-breakpoints.exp: Specify the link address
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 1372382..c4331fe 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -79,123 +79,6 @@ all threads stopped"
 
 delete_breakpoints
 
-# Test inferior call events
-
-gdb_test_multiple "info threads" "get current thread" {
-    -re "\[^\n\r\]*process (\[0-9\]+)\[^\n\r\]*do_nothing.*$gdb_prompt $" {
-	set process_id $expect_out(1,string)
-	pass "get current thread"
-    }
-}
-
-gdb_test_multiple "print do_nothing" "get address of do_nothing" {
-    -re "\[^\n\r\]*(0x\[0-9a-f\]+) \<do_nothing\>.*$gdb_prompt $" {
-	set addr $expect_out(1,string)
-	pass "get address of do_nothing"
-    }
-}
-
-set expected [list "event type: pre-call"]
-lappend expected "ptid: \\($process_id, $process_id, 0\\)" "address: $addr"
-lappend expected "event type: post-call"
-lappend expected "ptid: \\($process_id, $process_id, 0\\)" "address: $addr"
-gdb_test_sequence "call do_nothing()" "" $expected
-
-# Test register changed event
-gdb_test_no_output {set $old_sp = $sp}
-gdb_test_sequence {set $sp = 0} "" {
-    "event type: register-changed"
-    "frame: "
-    "num: "
-}
-gdb_test_sequence {set $sp = 1} "" {
-    "event type: register-changed"
-    "frame: "
-    "num: "
-}
-gdb_test_sequence {set $sp = $old_sp} "" {
-    "event type: register-changed"
-    "frame: "
-    "num: "
-}
-
-# Test that no register_changed event is generated on "non-user"
-# modifications
-set test "up"
-gdb_test_multiple {up} $test {
-    -re "event type: register-changed.*\r\n$gdb_prompt $" {
-	fail $test
-    }
-    -re "#1.*in first.*\r\n.*do_nothing.*\r\n$gdb_prompt $" {
-	pass $test
-    }
-}
-
-set test "down"
-gdb_test_multiple {down} $test {
-    -re "event type: register-changed.*\r\n$gdb_prompt $" {
-	fail $test
-    }
-    -re "#0.*do_nothing.* at .*\r\n.*void do_nothing.*\r\n$gdb_prompt $" {
-	pass $test
-    }
-}
-
-set test "step"
-# Note: This will step the inferior out of do_nothing and back into first.
-gdb_test_multiple {step} $test {
-    -re "event type: register-changed.*\r\n$gdb_prompt $" {
-	fail $test
-    }
-    -re "first.* at .*\r\n$gdb_prompt $" {
-	pass $test
-    }
-}
-
-# Test memory changed event
-gdb_test_no_output {set $saved = *(int*) $sp}
-gdb_test_sequence {set *(int*) $sp = 0} "" {
-    "event type: memory-changed"
-    "address: "
-    "length: "
-}
-gdb_test_sequence {set *(int*) $sp = $saved} "" {
-    "event type: memory-changed"
-    "address: "
-    "length: "
-}
-
-# Test that no memory_changed event is generated on breakpoint
-# activity
-set test "break second"
-gdb_test_multiple "break second" $test {
-    -re "event type: memory-changed" {
-	fail $test
-    }
-    -re "Breakpoint (\[0-9\]+) at .*\r\n$gdb_prompt $" {
-	set second_breakpoint $expect_out(1,string)
-	pass $test
-    }
-
-}
-
-set test "continue to breakpoint $second_breakpoint"
-set expected ".*event type: continue.*\r\n"
-append expected ".*event type: stop.*\r\n"
-append expected ".*stop reason: breakpoint.*\r\n"
-append expected ".*all threads stopped.*\r\n$gdb_prompt $"
-
-gdb_test_multiple "continue" $test {
-    -re "event type: memory-changed.*\r\n$gdb_prompt $" {
-	fail $test
-    }
-    -re $expected {
-	pass $test
-    }
-}
-
-gdb_test_no_output "delete $second_breakpoint"
-
 #test exited event.
 gdb_test "continue" ".*event type: continue.*
 .*clear_objfiles\[\r\n\]*progspace: .*py-events.*
diff --git a/gdb/testsuite/gdb.python/py-events.py b/gdb/testsuite/gdb.python/py-events.py
index 3bc5ff4..9af768b 100644
--- a/gdb/testsuite/gdb.python/py-events.py
+++ b/gdb/testsuite/gdb.python/py-events.py
@@ -62,30 +62,6 @@ def clear_objfiles_handler (event):
     print ("event type: clear_objfiles")
     print ("progspace: %s" % (event.progspace.filename))
 
-def inferior_call_handler (event):
-    if (isinstance (event, gdb.InferiorCallPreEvent)):
-        print ("event type: pre-call")
-    elif (isinstance (event, gdb.InferiorCallPostEvent)):
-        print ("event type: post-call")
-    else:
-        assert False
-    print ("ptid: %s" % (event.ptid,))
-    print ("address: 0x%x" % (event.address))
-
-def register_changed_handler (event):
-    assert (isinstance (event, gdb.RegisterChangedEvent))
-    print ("event type: register-changed")
-    assert (isinstance (event.frame, gdb.Frame))
-    print ("frame: %s" % (event.frame))
-    print ("num: %s" % (event.regnum))
-
-def memory_changed_handler (event):
-    assert (isinstance (event, gdb.MemoryChangedEvent))
-    print ("event type: memory-changed")
-    print ("address: %s" % (event.address))
-    print ("length: %s" % (event.length))
-
-
 class test_events (gdb.Command):
     """Test events."""
 
@@ -97,9 +73,6 @@ class test_events (gdb.Command):
         gdb.events.stop.connect (breakpoint_stop_handler)
         gdb.events.exited.connect (exit_handler)
         gdb.events.cont.connect (continue_handler)
-        gdb.events.inferior_call.connect (inferior_call_handler)
-        gdb.events.memory_changed.connect (memory_changed_handler)
-        gdb.events.register_changed.connect (register_changed_handler)
         print ("Event testers registered.")
 
 test_events ()