diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 247173d761..a44cba2bce 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2016-02-14 Jan Kratochvil + + Fix compatibility with recent gfortran-5.3.1. + * gdb.fortran/vla-history.exp (print vla1 allocated) + (print vla2 allocated, print $2, print $3): Remove + (print $4): Rename to ... + (print $2): ... here. + (print $9): Rename to ... + (print $5): ... here. + (print $10): Rename to ... + (print $6): ... here. + * gdb.fortran/vla.f90: Add pvla initialization. + 2016-02-14 Jan Kratochvil * gdb.fortran/vla-value-sub-finish.exp (set max-value-size 1024*1024): diff --git a/gdb/testsuite/gdb.fortran/vla-history.exp b/gdb/testsuite/gdb.fortran/vla-history.exp index 315c61a79e..1478e6befc 100644 --- a/gdb/testsuite/gdb.fortran/vla-history.exp +++ b/gdb/testsuite/gdb.fortran/vla-history.exp @@ -32,10 +32,6 @@ gdb_test "print vla1" " = " "print non-allocated vla1" gdb_breakpoint [gdb_get_line_number "vla2-allocated"] gdb_continue_to_breakpoint "vla2-allocated" -gdb_test "print vla1" " = \\( *\\( *\\( *0, *0, *0,\[()0, .\]*\\)" \ - "print vla1 allocated" -gdb_test "print vla2" " = \\( *\\( *\\( *0, *0, *0,\[()0, .\]*\\)" \ - "print vla2 allocated" gdb_breakpoint [gdb_get_line_number "vla1-filled"] gdb_continue_to_breakpoint "vla1-filled" @@ -45,12 +41,8 @@ gdb_test "print vla1" \ # Try to access history values for full vla prints. gdb_test "print \$1" " = " "print \$1" -gdb_test "print \$2" " = \\( *\\( *\\( *0, *0, *0,\[()0, .\]*\\)" \ - "print \$2" -gdb_test "print \$3" " = \\( *\\( *\\( *0, *0, *0,\[()0, .\]*\\)" \ - "print \$3" -gdb_test "print \$4" \ - " = \\( *\\( *\\( *1311, *1311, *1311,\[()1311, .\]*\\)" "print \$4" +gdb_test "print \$2" \ + " = \\( *\\( *\\( *1311, *1311, *1311,\[()1311, .\]*\\)" "print \$2" gdb_breakpoint [gdb_get_line_number "vla2-filled"] gdb_continue_to_breakpoint "vla2-filled" @@ -58,5 +50,5 @@ gdb_test "print vla2(1,43,20)" " = 1311" "print vla2(1,43,20)" gdb_test "print vla1(1,3,8)" " = 1001" "print vla2(1,3,8)" # Try to access history values for vla values. -gdb_test "print \$9" " = 1311" "print \$9" -gdb_test "print \$10" " = 1001" "print \$10" +gdb_test "print \$5" " = 1311" "print \$5" +gdb_test "print \$6" " = 1001" "print \$6" diff --git a/gdb/testsuite/gdb.fortran/vla.f90 b/gdb/testsuite/gdb.fortran/vla.f90 index 6a966354ec..c76d24cfa8 100644 --- a/gdb/testsuite/gdb.fortran/vla.f90 +++ b/gdb/testsuite/gdb.fortran/vla.f90 @@ -19,6 +19,7 @@ program vla real, target, allocatable :: vla3 (:, :) real, pointer :: pvla (:, :, :) logical :: l + nullify(pvla) allocate (vla1 (10,10,10)) ! vla1-init l = allocated(vla1)