* gdb.base/a1-selftest.exp (test_with_self), gdb.base/interrupt.exp:

	Call stty to set interrupt character.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 01717de283f68071221465d51eb0afab9a90d581..6a98c57f189a012cdebee2e3c4f105d158b3d297 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 Thu Jan 26 19:20:34 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * gdb.base/a1-selftest.exp (test_with_self), gdb.base/interrupt.exp:
+       Call stty to set interrupt character.
+
        * gdb.disasm/hppa.mt (hppa), gdb.stabs/hppa.mt (weird.o): Check
        for HP assembler versus GNU assembler based on actual behavior of
        $(CC), rather than assuming that $(AS) is always the GNU assembler.

diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index 5b1814687a66f9f449775325c09aad6c090a7100..14a4a06b5bd3f448a951a8fa8c9257c447215fbf 100644 (file)
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -384,7 +384,11 @@ proc test_with_self {} {
            }
        }
     }
-    
+
+    # We'll need this when we send a ^C to GDB    
+    gdb_test "shell stty intr ^C" "" \
+       "set interrupt character in test_with_self"
+
     # start the "xgdb" process
     send "continue\n"
     expect {

diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
new file mode 100644 (file)
index 0000000..522d8f8
--- /dev/null
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -0,0 +1,114 @@
+if $tracelevel then {
+       strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set binfile $objdir/$subdir/interrupt
+
+if ![file exists $binfile] then {
+    perror "$binfile does not exist."
+    return 0
+} else {
+    gdb_reinitialize_dir $srcdir/$subdir
+    gdb_load $binfile
+    gdb_test "shell stty intr ^C" "" \
+       "set interrupt character in interrupt.exp"
+    if [runto main] then {
+       send "continue\n"
+       expect {
+           -re "\r\ntalk to me baby\r\n$" {}
+           timeout { fail "run (timeout)" }
+           eof { fail "run (eof)" }
+       }
+       # This should appear twice, once for the echo and once for the
+       # program's output.  Under dejagnu (but not interactively) for
+       # SunOS4, it only appears once.  Don't worry about it, I imagine
+       # dejagnu has just done something to the tty modes.
+       send "a\n"
+       expect {
+           -re "^a\r\n(|a\r\n)$" {}
+           timeout { fail "echo a (timeout)" }
+           eof { fail "echo a (eof)" }
+       }
+       # Wait until the program is in the read system call again.
+       exec sleep 2
+
+       send "\003"
+       expect {
+           -re "Program received signal SIGINT.*$prompt $" {
+               pass "send control C"
+           }
+           -re ".*$prompt $" { fail "send control C" }
+           timeout { fail "send control C (timeout)" }
+           eof { fail "send control C (eof)" }
+       }
+
+       send "p func1 ()\n"
+       expect {
+           -re " = 4.*$prompt $" { pass "call function when asleep" }
+           -re "$prompt $" { fail "call function when asleep (wrong output)" }
+           timeout {
+
+               # This fail probably happens whenever we use /proc (we
+               # don't use PRSABORT), but apparently also happens on
+               # other machines as well.
+
+               setup_xfail "sparc-*-solaris2*"
+               setup_xfail "mips-*-ultrix*"
+               setup_xfail "hppa*-*-*"
+               setup_xfail "i386*-*-bsd*"
+               setup_xfail "*-*-sysv4*"
+               setup_xfail "vax-*-*"
+               setup_xfail "alpha-*-*"
+               setup_xfail "*-*-irix*"
+               fail "call function when asleep (stays asleep)"
+               # Send a newline to wake it up
+               send "\n"
+               gdb_test "" " = 4" "call function after waking it"
+           }
+           eof { fail "call function when asleep (eof)" }
+       }
+
+       # Now try calling the function again.
+       gdb_test "p func1 ()" " = 4" "call function a second time"
+
+       # And the program should still be doing the same thing.
+       # The optional trailing \r\n is in case we sent a newline above
+       # to wake the program, in which case the program now sends it
+       # back.  We check for it either here or in the next expect
+       # command, because which one it ends up in is timing dependent.
+       send "continue\n"
+       # For some reason, i386-*-sysv4 gdb fails to issue the Continuing
+       # message, but otherwise appears normal (FIXME).
+       expect {
+           -re "^continue\r\nContinuing.\r\n(\r\n|)$" { pass "continue" }
+           -re "^continue\r\n\r\n" { fail "continue (missing Continuing.)" }
+           -re "$prompt $" { fail "continue" }
+           timeout { fail "continue" }
+           eof { fail "continue" }
+       }
+
+       send "data\n"
+       # The optional leading \r\n is in case we sent a newline above
+       # to wake the program, in which case the program now sends it
+       # back.
+       expect {
+           -re "^(\r\n|)data\r\n(|data\r\n)$" { pass "echo data" }
+           timeout { fail "echo data (timeout)" }
+           eof { fail "echo data (eof)" }
+       }
+
+       send "\004"
+       expect {
+           -re "end of file.*Program exited normally.*$prompt $" {
+               pass "send end of file"
+           }
+           -re "$prompt $" { fail "send end of file" }
+           timeout { fail "send end of file (timeout)" }
+           eof { fail "send end of file (eof)" }
+       }
+    }
+}
+return 0