aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2012-03-03 15:11:24 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2012-03-03 15:11:24 +0100
commit905f067ca0ead2bffc682701b3b10203a5c911c2 (patch)
treee5e6a5ae4b00a9836d59d65def68505d34806cde
parentda848353a845908883f7a275dc040b40daf8fc38 (diff)
downloadgcc-905f067ca0ead2bffc682701b3b10203a5c911c2.zip
gcc-905f067ca0ead2bffc682701b3b10203a5c911c2.tar.gz
gcc-905f067ca0ead2bffc682701b3b10203a5c911c2.tar.bz2
re PR fortran/48820 (TR 29113: Implement parts needed for MPI 3)
2012-03-03 Tobias Burnus <burnus@net-b.de> PR fortran/48820 * gfortran.dg/assumed_type_1.f90: Correct dg-error. * gfortran.dg/assumed_type_3.f90: Correct dg-error. * gfortran.dg/assumed_type_4.f90: Correct dg-error. From-SVN: r184856
-rw-r--r--gcc/testsuite/ChangeLog7
-rw-r--r--gcc/testsuite/gfortran.dg/assumed_type_1.f901
-rw-r--r--gcc/testsuite/gfortran.dg/assumed_type_3.f9018
-rw-r--r--gcc/testsuite/gfortran.dg/assumed_type_4.f904
4 files changed, 19 insertions, 11 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e95a0ee..65e9aae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,13 @@
2012-03-03 Tobias Burnus <burnus@net-b.de>
PR fortran/48820
+ * gfortran.dg/assumed_type_1.f90: Correct dg-error.
+ * gfortran.dg/assumed_type_3.f90: Correct dg-error.
+ * gfortran.dg/assumed_type_4.f90: Correct dg-error.
+
+2012-03-03 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/48820
* gfortran.dg/assumed_type_1.f90: New.
* gfortran.dg/assumed_type_2.f90: New.
* gfortran.dg/assumed_type_3.f90: New.
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_1.f90 b/gcc/testsuite/gfortran.dg/assumed_type_1.f90
index c491146..7ac98f8 100644
--- a/gcc/testsuite/gfortran.dg/assumed_type_1.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_type_1.f90
@@ -49,7 +49,6 @@ use mpi_interface
contains
subroutine foo(x)
type(*):: x(*)
- call MPI_Send(x, 1, 1,1,1,j,i)
call MPI_Send2(x, 1, 1,1,1,j,i)
end
end
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_3.f90 b/gcc/testsuite/gfortran.dg/assumed_type_3.f90
index 8497691..15619ce 100644
--- a/gcc/testsuite/gfortran.dg/assumed_type_3.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_type_3.f90
@@ -5,6 +5,11 @@
!
! Test TYPE(*)
+subroutine fourteen(x)
+ type(*) :: x
+ x = x ! { dg-error "Invalid expression with assumed-type variable" }
+end subroutine fourteen
+
subroutine one(a) ! { dg-error "may not have the ALLOCATABLE, CODIMENSION, POINTER or VALUE attribute" }
type(*), value :: a
end subroutine one
@@ -52,10 +57,10 @@ subroutine nine()
subroutine okay2(x)
type(*) :: x(*)
end subroutine okay2
- subroutine okay2(x,y)
+ subroutine okay3(x,y)
integer :: x
type(*) :: y
- end subroutine okay2
+ end subroutine okay3
end interface
interface two
subroutine okok1(x)
@@ -100,10 +105,10 @@ end subroutine eleven
subroutine twelf(x)
type(*) :: x
- call bar(x)
+ call bar(x) ! { dg-error "Type mismatch in argument" }
contains
subroutine bar(x)
- integer :: x ! { dg-error "Type mismatch in argument" }
+ integer :: x
end subroutine bar
end subroutine twelf
@@ -113,7 +118,4 @@ subroutine thirteen(x, y)
print *, ubound(y, dim=x) ! { dg-error "must be INTEGER" }
end subroutine thirteen
-subroutine fourteen(x)
- type(*) :: x
- x = x ! { dg-error "Invalid expression with assumed-type variable" }
-end subroutine fourteen
+
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_4.f90 b/gcc/testsuite/gfortran.dg/assumed_type_4.f90
index 0b8faa8..1ea982e 100644
--- a/gcc/testsuite/gfortran.dg/assumed_type_4.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_type_4.f90
@@ -5,6 +5,6 @@
!
! Test TYPE(*)
-subroutine one(a) ! { dg-error "TS 29113: Assumed type" }
- type(*) :: a
+subroutine one(a)
+ type(*) :: a ! { dg-error "TS 29113: Assumed type" }
end subroutine one