Commits

Satish Balay committed 0a101eb

testexamples: add testexamples_F90_DataTypes for --with-f90-datatypes build.
[and disable other fortran examples when f90-datatypes is used

Comments (0)

Files changed (3)

 testexamples_C_NoComplex: ${TESTEXAMPLES_C_NOCOMPLEX}
 testexamples_DATAFILESPATH: ${TESTEXAMPLES_DATAFILESPATH}
 
+testexamples_F90_DataTypes: ${TESTEXAMPLES_F90_DATATYPES}
 testexamples_Fortran_NoComplex: ${TESTEXAMPLES_FORTRAN_NOCOMPLEX}
 testexamples_Fortran_MPIUni: ${TESTEXAMPLES_FORTRAN_MPIUNI}
 testexamples_Fortran_Complex: ${TESTEXAMPLES_FORTRAN_COMPLEX}
 buildexamples_DATAFILESPATH:
 	-@${OMAKE} testexamples_DATAFILESPATH TESTEXAMPLES_DATAFILESPATH=`echo ${TESTEXAMPLES_DATAFILESPATH} | sed s/runex[0-9]*[a-z0-9_]*//g`
 
+buildexamples_F90_DataTypes:
+	-@${OMAKE} testexamples_F90_DataTypes TESTEXAMPLES_F90_DATATYPES=`echo ${TESTEXAMPLES_F90_DATATYPES} | sed s/runex[0-9]*[a-z0-9_]*//g`
 buildexamples_Fortran_NoComplex:
 	-@${OMAKE} testexamples_Fortran_NoComplex TESTEXAMPLES_FORTRAN_NOCOMPLEX=`echo ${TESTEXAMPLES_FORTRAN_NOCOMPLEX} | sed s/runex[0-9]*[a-z0-9_]*//g`
 buildexamples_Fortran_MPIUni:

config/PETSc/utilities/Regression.py

     self.compilers     = framework.require('config.compilers', self)
     self.mpi           = framework.require('config.packages.MPI', self)
     self.x             = framework.require('PETSc.packages.X', self)
+    self.fortrancpp    = framework.require('PETSc.utilities.fortranCPP', self)
     return
 
   def configureRegression(self):
       jobs.append('C')
       if self.x.found:
         jobs.append('C_X')
-      if hasattr(self.compilers, 'FC'):
+      if self.fortrancpp.fortranDatatypes and hasattr(self.compilers, 'FC'):
+        jobs.append('F90_DataTypes')
+      elif hasattr(self.compilers, 'FC'):
         jobs.append('Fortran')
         if self.compilers.fortranIsF90:
           rjobs.append('F90')

src/snes/examples/tutorials/makefile

                                  ex48.PETSc runex48 runex48_2 runex48_3 runex48_4 runex48_5 ex48.rm \
                                  ex58.PETSc runex58 runex58_2 ex58.rm
 TESTEXAMPLES_C_X	       = ex1.PETSc runex1_X ex1.rm ex19.PETSc runex19_draw ex19.rm
+TESTEXAMPLES_F90_DATATYPES     = ex5f90t.PETSc runex5f90t ex5f90t.rm
 TESTEXAMPLES_FORTRAN	       = ex1f.PETSc runex1f ex1f.rm ex40f90.PETSc runex40f90 ex40f90.rm
 TESTEXAMPLES_C_NOCOMPLEX       = ex30.PETSc ex30.rm  ex9.PETSc runex9 runex9_2 runex9_3 runex9_4 ex9.rm
 TESTEXAMPLES_FORTRAN_NOCOMPLEX = ex5f.PETSc runex5f runex5f_3 ex5f.rm