gdb/testsuite/

	Fix racy FAILs.
	* gdb.base/inferior-died.c (main): Add return of 0.
	* gdb.base/inferior-died.exp (continue): Fix expectation of
	asynchronous events.
	(p 1): New test.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a7235a6..133bc26 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Fix racy FAILs.
+       * gdb.base/inferior-died.c (main): Add return of 0.
+       * gdb.base/inferior-died.exp (continue): Fix expectation of
+       asynchronous events.
+       (p 1): New test.
+
 2012-02-20  Pedro Alves  <palves@redhat.com>
 
        * gdb.threads/attach-into-signal.exp (corefunc): Don't enable

diff --git a/gdb/testsuite/gdb.base/inferior-died.c b/gdb/testsuite/gdb.base/inferior-died.c
index b3a97ae..ce9dcea 100644 (file)
--- a/gdb/testsuite/gdb.base/inferior-died.c
+++ b/gdb/testsuite/gdb.base/inferior-died.c
@@ -33,4 +33,5 @@ int main()
     function ();
   else
     waitpid (child, NULL, 0);
+  return 0;
 }

diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp
index 458dd61..976a14f 100644 (file)
--- a/gdb/testsuite/gdb.base/inferior-died.exp
+++ b/gdb/testsuite/gdb.base/inferior-died.exp
@@ -53,4 +53,19 @@ gdb_breakpoint $srcfile:$line
 gdb_continue_to_breakpoint "breakpoint"
 
 gdb_test "inferior 2" "Switching to inferior 2.*"
-gdb_test "continue" "exited normally.*"
+
+# The inferior 1 exit may come unexpectedly in any moment.
+set test "continue"
+set seen 0
+gdb_test_multiple $test $test {
+    -re "($gdb_prompt |\\\[Inferior \[^\r\n\]* exited normally\\\])" {
+       incr seen
+       if {$seen < 3} {
+           exp_continue
+       }
+       pass $test
+    }
+}
+
+# Internal error may show up after all the messages above.
+gdb_test "p 1" " = 1"