2013-08-29 Phil Muldoon <pmuldoon@redhat.com>

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.ada / tasks.exp

diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp
index e5d9f924d1dcf9c39f03d4013f370f733d444dd5..0d30d163f8e796cfd13b49043e0fac6b2442da8b 100644 (file)
--- a/gdb/testsuite/gdb.ada/tasks.exp
+++ b/gdb/testsuite/gdb.ada/tasks.exp
@@ -1,4 +1,4 @@
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,26 +13,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 load_lib "ada.exp"
 
-set testdir "tasks"
-set testfile "${testdir}/foo"
-set srcfile ${srcdir}/${subdir}/${testfile}.adb
-set binfile ${objdir}/${subdir}/${testfile}
+standard_ada_testfile foo
 
-file mkdir ${objdir}/${subdir}/${testdir}
 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 
 set bp_location [gdb_get_line_number "STOP_HERE" ${testdir}/foo.adb]
 runto "foo.adb:$bp_location"
@@ -40,11 +29,11 @@ runto "foo.adb:$bp_location"
 # Make sure that all tasks appear in the "info tasks" listing, and
 # that the active task is the environment task.
 gdb_test "info tasks" \
-         [join {"  ID       TID P-ID Pri State                  Name" \
-                "\\*  1 .* main_task" \
-                "   2 .* task_list\\(1\\)" \
-                "   3 .* task_list\\(2\\)" \
-                "   4 .* task_list\\(3\\)"} \
+         [join {" +ID +TID P-ID Pri State +Name" \
+                "\\* +1 .* main_task" \
+                " +2 .* task_list\\(1\\)" \
+                " +3 .* task_list\\(2\\)" \
+                " +4 .* task_list\\(3\\)"} \
                "\r\n"] \
          "info tasks before inserting breakpoint"
 
@@ -62,18 +51,15 @@ gdb_test "continue" \
 # Check that it is indeed task 3 that hit the breakpoint by checking
 # which is the active task.
 gdb_test "info tasks" \
-         [join {"  ID       TID P-ID Pri State                  Name" \
-                "   1 .* main_task" \
-                "   2 .* task_list\\(1\\)" \
-                "\\*  3 .* task_list\\(2\\)" \
-                "   4 .* task_list\\(3\\)"} \
+         [join {" +ID +TID P-ID Pri State +Name" \
+                " +1 .* main_task" \
+                " +2 .* task_list\\(1\\)" \
+                "\\* +3 .* task_list\\(2\\)" \
+                " +4 .* task_list\\(3\\)"} \
                "\r\n"] \
          "info tasks after hitting breakpoint"
 
 # Now, resume the execution and make sure that GDB does not stop when
 # task 4 hits the breakpoint. Continuing thus results in our program
 # running to completion.
-gdb_test "continue" \
-         ".*Program exited normally\..*" \
-         "continue until end of program"
-
+gdb_continue_to_end "" continue 1